[PATCH 1/1] UBUNTU: [Config] Adding dove-z0 flavour

Brad Figg brad.figg at canonical.com
Fri Aug 21 15:10:48 UTC 2009


Currently there are two different reference boards from Marvell (Z0 and Y0). Z0
was the initial dev board and is now superseded by the Y0. The Y0 is what Marvell
are doing development against currently. However, Canonical has a few Z0 boards
and it would be nice to be able to easily build kernels for them.

Signed-off-by: Brad Figg <brad.figg at canonical.com>
---
 debian.mvl-dove/config/armel/config.flavour.dove   |   35 +++++++++++++++
 .../config/armel/config.flavour.dove-z0            |   38 ++++++++++++++++
 debian.mvl-dove/config/config.common.ubuntu        |   47 +++++---------------
 debian.mvl-dove/control.d/vars.dove-z0             |    9 ++++
 debian.mvl-dove/d-i/kernel-versions.in             |    1 +
 debian.mvl-dove/rules.d/armel.mk                   |    2 +-
 debian.mvl-dove/scripts/misc/getabis               |    2 +-
 7 files changed, 97 insertions(+), 37 deletions(-)
 create mode 100644 debian.mvl-dove/config/armel/config.flavour.dove-z0
 create mode 100644 debian.mvl-dove/control.d/vars.dove-z0

diff --git a/debian.mvl-dove/config/armel/config.flavour.dove b/debian.mvl-dove/config/armel/config.flavour.dove
index b905723..35cb472 100644
--- a/debian.mvl-dove/config/armel/config.flavour.dove
+++ b/debian.mvl-dove/config/armel/config.flavour.dove
@@ -1,3 +1,38 @@
 #
 # Config options for config.flavour.dove automatically generated by splitconfig.pl
 #
+CONFIG_8139TOO=m
+CONFIG_BLK_DEV_CRYPTOLOOP=m
+CONFIG_CACHE_L2LINEFILL_BURST8_ENABLE=y
+CONFIG_CPU_32v6K=y
+CONFIG_CPU_FREQ=y
+CONFIG_CPU_IDLE=y
+# CONFIG_CPU_V6 is not set
+CONFIG_CPU_V7=y
+# CONFIG_CPU_WA_DISABLE is not set
+CONFIG_CPU_WA_ENABLE=y
+CONFIG_DOVE_REV_Y0=y
+# CONFIG_DOVE_REV_Z0 is not set
+CONFIG_E100=m
+CONFIG_E1000E=y
+CONFIG_GPIO_PCA953X=y
+CONFIG_GPIO_SYSFS=y
+CONFIG_HWMON=y
+# CONFIG_LOCALVERSION_AUTO is not set
+# CONFIG_MACH_DOVE_RD is not set
+CONFIG_MODULE_SRCVERSION_ALL=y
+CONFIG_MODVERSIONS=y
+# CONFIG_MRV_PTE_IN_L2 is not set
+CONFIG_MV_L2_WA_ON=y
+CONFIG_SATA_AHCI=m
+CONFIG_SCSI_MVSATA=y
+CONFIG_SKY2=y
+CONFIG_SND_MIXER_OSS=m
+CONFIG_SND_PCM_OSS=m
+CONFIG_SND_USB_AUDIO=m
+CONFIG_SND_USB_CAIAQ=m
+CONFIG_SOUND_OSS_CORE=y
+CONFIG_SOUND_PRIME=y
+CONFIG_TIMER_STATS=y
+CONFIG_UIO_DOVE_VPRO_MEM_SIZE=96
+CONFIG_USB_SUSPEND=y
diff --git a/debian.mvl-dove/config/armel/config.flavour.dove-z0 b/debian.mvl-dove/config/armel/config.flavour.dove-z0
new file mode 100644
index 0000000..03cf6a3
--- /dev/null
+++ b/debian.mvl-dove/config/armel/config.flavour.dove-z0
@@ -0,0 +1,38 @@
+#
+# Config options for config.flavour.dove-z0 automatically generated by splitconfig.pl
+#
+# CONFIG_8139TOO is not set
+# CONFIG_BLK_DEV_CRYPTOLOOP is not set
+# CONFIG_CACHE_L2LINEFILL_BURST8_ENABLE is not set
+# CONFIG_CPU_32v6K is not set
+# CONFIG_CPU_FREQ is not set
+# CONFIG_CPU_IDLE is not set
+CONFIG_CPU_V6=y
+# CONFIG_CPU_V7 is not set
+CONFIG_CPU_WA_DISABLE=y
+# CONFIG_CPU_WA_ENABLE is not set
+# CONFIG_DOVE_REV_Y0 is not set
+CONFIG_DOVE_REV_Z0=y
+CONFIG_E100=y
+# CONFIG_E1000E is not set
+# CONFIG_GPIO_PCA953X is not set
+# CONFIG_GPIO_SYSFS is not set
+# CONFIG_HWMON is not set
+CONFIG_LOCALVERSION_AUTO=y
+CONFIG_MACH_DOVE_RD=y
+# CONFIG_MODULE_SRCVERSION_ALL is not set
+# CONFIG_MODVERSIONS is not set
+CONFIG_MRV_PTE_IN_L2=y
+# CONFIG_MV_L2_WA_ON is not set
+# CONFIG_SATA_AHCI is not set
+# CONFIG_SCSI_MVSATA is not set
+# CONFIG_SKY2 is not set
+# CONFIG_SND_MIXER_OSS is not set
+# CONFIG_SND_PCM_OSS is not set
+# CONFIG_SND_USB_AUDIO is not set
+# CONFIG_SND_USB_CAIAQ is not set
+# CONFIG_SOUND_OSS_CORE is not set
+# CONFIG_SOUND_PRIME is not set
+# CONFIG_TIMER_STATS is not set
+CONFIG_UIO_DOVE_VPRO_MEM_SIZE=34
+# CONFIG_USB_SUSPEND is not set
diff --git a/debian.mvl-dove/config/config.common.ubuntu b/debian.mvl-dove/config/config.common.ubuntu
index a6954aa..a762404 100644
--- a/debian.mvl-dove/config/config.common.ubuntu
+++ b/debian.mvl-dove/config/config.common.ubuntu
@@ -2,7 +2,6 @@
 # Common config options automatically generated by splitconfig.pl
 #
 # CONFIG_8139CP is not set
-CONFIG_8139TOO=m
 # CONFIG_8139TOO_8129 is not set
 CONFIG_8139TOO_PIO=y
 # CONFIG_8139TOO_TUNE_TWISTER is not set
@@ -76,6 +75,7 @@ CONFIG_ARCH_SUSPEND_POSSIBLE=y
 # CONFIG_ARCH_W90X900 is not set
 # CONFIG_ARCNET is not set
 CONFIG_ARM=y
+# CONFIG_ARM_ERRATA_411920 is not set
 # CONFIG_ARM_ERRATA_430973 is not set
 # CONFIG_ARM_ERRATA_458693 is not set
 # CONFIG_ARM_ERRATA_460075 is not set
@@ -129,7 +129,6 @@ CONFIG_BLK_DEV=y
 # CONFIG_BLK_DEV_3W_XXXX_RAID is not set
 # CONFIG_BLK_DEV_BSG is not set
 # CONFIG_BLK_DEV_COW_COMMON is not set
-CONFIG_BLK_DEV_CRYPTOLOOP=m
 # CONFIG_BLK_DEV_DAC960 is not set
 # CONFIG_BLK_DEV_INITRD is not set
 # CONFIG_BLK_DEV_INTEGRITY is not set
@@ -178,7 +177,6 @@ CONFIG_BT_L2CAP=m
 # CONFIG_BT_RFCOMM is not set
 # CONFIG_BT_SCO is not set
 CONFIG_BUG=y
-CONFIG_CACHE_L2LINEFILL_BURST8_ENABLE=y
 CONFIG_CACHE_TAUROS2=y
 # CONFIG_CAN is not set
 # CONFIG_CASSINI is not set
@@ -205,10 +203,12 @@ CONFIG_CONSTRUCTORS=y
 CONFIG_CONTEXT_SWITCH_TRACER=y
 # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
 CONFIG_CPU_32=y
-CONFIG_CPU_32v6K=y
+CONFIG_CPU_32v6=y
 CONFIG_CPU_32v7=y
+CONFIG_CPU_ABRT_EV6=y
 CONFIG_CPU_ABRT_EV7=y
 # CONFIG_CPU_BPREDICT_DISABLE is not set
+CONFIG_CPU_CACHE_V6=y
 CONFIG_CPU_CACHE_V7=y
 CONFIG_CPU_CACHE_VIPT=y
 CONFIG_CPU_COPY_V6=y
@@ -216,7 +216,6 @@ CONFIG_CPU_CP15=y
 CONFIG_CPU_CP15_MMU=y
 # CONFIG_CPU_DCACHE_DISABLE is not set
 CONFIG_CPU_ENABLE_WRITECO=y
-CONFIG_CPU_FREQ=y
 # CONFIG_CPU_FREQ_DEBUG is not set
 # CONFIG_CPU_FREQ_DEFAULT_GOV_CONSERVATIVE is not set
 CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y
@@ -234,18 +233,15 @@ CONFIG_CPU_FREQ_STAT_DETAILS=y
 CONFIG_CPU_FREQ_TABLE=y
 CONFIG_CPU_HAS_ASID=y
 # CONFIG_CPU_ICACHE_DISABLE is not set
-CONFIG_CPU_IDLE=y
 CONFIG_CPU_IDLE_GOV_LADDER=y
 CONFIG_CPU_IDLE_GOV_MENU=y
 # CONFIG_CPU_L1WAONLY_ENABLE is not set
 CONFIG_CPU_PABRT_IFAR=y
+CONFIG_CPU_PABRT_NOIFAR=y
 CONFIG_CPU_PJ4=y
 # CONFIG_CPU_PJ4_PMC_ACCESS_IN_USERMODE is not set
+CONFIG_CPU_TLB_V6=y
 CONFIG_CPU_TLB_V7=y
-# CONFIG_CPU_V6 is not set
-CONFIG_CPU_V7=y
-# CONFIG_CPU_WA_DISABLE is not set
-CONFIG_CPU_WA_ENABLE=y
 CONFIG_CPU_WRITECO_CYCLE=3
 CONFIG_CRAMFS=y
 CONFIG_CRC16=y
@@ -379,16 +375,12 @@ CONFIG_DOVE_DEBUGGER_MODE_V6=y
 CONFIG_DOVE_GPU=y
 CONFIG_DOVE_GPU_MEM_SIZE=128
 CONFIG_DOVE_PM_SUPPORT=y
-CONFIG_DOVE_REV_Y0=y
-# CONFIG_DOVE_REV_Z0 is not set
 # CONFIG_DRM is not set
 # CONFIG_DS1682 is not set
 # CONFIG_DUMMY is not set
 CONFIG_DUMMY_CONSOLE=y
 # CONFIG_DYNAMIC_DEBUG is not set
-CONFIG_E100=m
 CONFIG_E1000=y
-CONFIG_E1000E=y
 # CONFIG_ECONET is not set
 # CONFIG_EFI_PARTITION is not set
 # CONFIG_EFS_FS is not set
@@ -533,9 +525,7 @@ CONFIG_GPIOLIB=y
 # CONFIG_GPIO_MAX7301 is not set
 # CONFIG_GPIO_MAX732X is not set
 # CONFIG_GPIO_MCP23S08 is not set
-CONFIG_GPIO_PCA953X=y
 # CONFIG_GPIO_PCF857X is not set
-CONFIG_GPIO_SYSFS=y
 # CONFIG_GROUP_SCHED is not set
 # CONFIG_HAMACHI is not set
 # CONFIG_HAMRADIO is not set
@@ -602,7 +592,6 @@ CONFIG_HOTPLUG=y
 # CONFIG_HTC_EGPIO is not set
 # CONFIG_HTC_PASIC3 is not set
 # CONFIG_HUGETLB_PAGE is not set
-CONFIG_HWMON=y
 # CONFIG_HWMON_DEBUG_CHIP is not set
 # CONFIG_HWMON_VID is not set
 CONFIG_HW_CONSOLE=y
@@ -777,7 +766,6 @@ CONFIG_LIBCRC32C=y
 # CONFIG_LKDTM is not set
 # CONFIG_LLC2 is not set
 CONFIG_LOCALVERSION=""
-# CONFIG_LOCALVERSION_AUTO is not set
 CONFIG_LOCKD=y
 CONFIG_LOCKDEP_SUPPORT=y
 CONFIG_LOCKD_V4=y
@@ -794,8 +782,10 @@ CONFIG_LZO_DECOMPRESS=y
 CONFIG_M25PXX_USE_FAST_READ=y
 CONFIG_MAC80211_DEFAULT_PS_VALUE=0
 CONFIG_MACH_DOVE_DB=y
-# CONFIG_MACH_DOVE_RD is not set
+CONFIG_MACH_DOVE_DB_Z0=y
 # CONFIG_MACH_DOVE_RD_AVNG is not set
+# CONFIG_MACH_DOVE_RD_AVNG_NB_Z0 is not set
+# CONFIG_MACH_DOVE_RD_AVNG_Z0 is not set
 # CONFIG_MACVLAN is not set
 # CONFIG_MAC_PARTITION is not set
 CONFIG_MAGIC_SYSRQ=y
@@ -844,9 +834,7 @@ CONFIG_MMU=y
 CONFIG_MODULES=y
 # CONFIG_MODULE_FORCE_LOAD is not set
 # CONFIG_MODULE_FORCE_UNLOAD is not set
-# CONFIG_MODULE_SRCVERSION_ALL is not set
 CONFIG_MODULE_UNLOAD=y
-# CONFIG_MODVERSIONS is not set
 # CONFIG_MOUSE_APPLETOUCH is not set
 # CONFIG_MOUSE_BCM5974 is not set
 CONFIG_MOUSE_GPIO=y
@@ -854,7 +842,6 @@ CONFIG_MOUSE_GPIO=y
 # CONFIG_MOUSE_SERIAL is not set
 # CONFIG_MOUSE_SYNAPTICS_I2C is not set
 # CONFIG_MOUSE_VSXXXAA is not set
-# CONFIG_MRV_PTE_IN_L2 is not set
 CONFIG_MSDOS_FS=y
 CONFIG_MSDOS_PARTITION=y
 CONFIG_MTD=y
@@ -971,7 +958,6 @@ CONFIG_MV_INCLUDE_PMU=y
 CONFIG_MV_INCLUDE_USB=y
 # CONFIG_MV_INCLUDE_XOR is not set
 CONFIG_MV_L2_PREFETCH_OFF=y
-CONFIG_MV_L2_WA_ON=y
 # CONFIG_MV_LINUX_COUNTERS_DISABLE is not set
 CONFIG_MV_MTD_GANG_SUPPORT=y
 CONFIG_MV_SATA_ENABLE_1MB_IOS=y
@@ -1084,6 +1070,8 @@ CONFIG_OCF_OCF=y
 # CONFIG_OCF_TALITOS is not set
 # CONFIG_OMFS_FS is not set
 CONFIG_OPROFILE=y
+CONFIG_OPROFILE_ARM11_CORE=y
+CONFIG_OPROFILE_ARMV6=y
 CONFIG_OPROFILE_MRVL_PJ4=y
 # CONFIG_OSF_PARTITION is not set
 CONFIG_OUTER_CACHE=y
@@ -1241,7 +1229,6 @@ CONFIG_RT_MUTEXES=y
 # CONFIG_RT_MUTEX_TESTER is not set
 CONFIG_RWSEM_GENERIC_SPINLOCK=y
 # CONFIG_SAMPLES is not set
-CONFIG_SATA_AHCI=m
 CONFIG_SATA_DEBUG_ON_ERROR=y
 # CONFIG_SATA_FULL_DEBUG is not set
 # CONFIG_SATA_INIC162X is not set
@@ -1296,7 +1283,6 @@ CONFIG_SCSI_LOWLEVEL=y
 # CONFIG_SCSI_MPT2SAS is not set
 # CONFIG_SCSI_MULTI_LUN is not set
 # CONFIG_SCSI_MVSAS is not set
-CONFIG_SCSI_MVSATA=y
 # CONFIG_SCSI_NETLINK is not set
 # CONFIG_SCSI_NSP32 is not set
 # CONFIG_SCSI_OSD_INITIATOR is not set
@@ -1365,6 +1351,7 @@ CONFIG_SENSORS_DOVE=y
 # CONFIG_SENSORS_MAX6650 is not set
 # CONFIG_SENSORS_PC87360 is not set
 # CONFIG_SENSORS_PC87427 is not set
+# CONFIG_SENSORS_PCA9539 is not set
 # CONFIG_SENSORS_PCF8574 is not set
 # CONFIG_SENSORS_PCF8591 is not set
 # CONFIG_SENSORS_SHT15 is not set
@@ -1404,7 +1391,6 @@ CONFIG_SIGNALFD=y
 # CONFIG_SIS190 is not set
 # CONFIG_SIS900 is not set
 # CONFIG_SKGE is not set
-CONFIG_SKY2=y
 # CONFIG_SKY2_DEBUG is not set
 CONFIG_SLAB=y
 CONFIG_SLABINFO=y
@@ -1482,7 +1468,6 @@ CONFIG_SND_JACK=y
 # CONFIG_SND_MAESTRO3 is not set
 # CONFIG_SND_MIA is not set
 # CONFIG_SND_MIXART is not set
-CONFIG_SND_MIXER_OSS=m
 # CONFIG_SND_MONA is not set
 # CONFIG_SND_MPU401 is not set
 # CONFIG_SND_MRVL_AUDIO is not set
@@ -1494,7 +1479,6 @@ CONFIG_SND_OSSEMUL=y
 # CONFIG_SND_OXYGEN is not set
 CONFIG_SND_PCI=y
 CONFIG_SND_PCM=y
-CONFIG_SND_PCM_OSS=m
 CONFIG_SND_PCM_OSS_PLUGINS=y
 # CONFIG_SND_PCXHR is not set
 CONFIG_SND_PXA2XX_LIB=y
@@ -1524,8 +1508,6 @@ CONFIG_SND_SUPPORT_OLD_API=y
 CONFIG_SND_TIMER=y
 # CONFIG_SND_TRIDENT is not set
 CONFIG_SND_USB=y
-CONFIG_SND_USB_AUDIO=m
-CONFIG_SND_USB_CAIAQ=m
 CONFIG_SND_USB_CAIAQ_INPUT=y
 # CONFIG_SND_VERBOSE_PRINTK is not set
 CONFIG_SND_VERBOSE_PROCFS=y
@@ -1537,8 +1519,6 @@ CONFIG_SND_VMASTER=y
 # CONFIG_SND_YMFPCI is not set
 # CONFIG_SOLARIS_X86_PARTITION is not set
 CONFIG_SOUND=y
-CONFIG_SOUND_OSS_CORE=y
-CONFIG_SOUND_PRIME=y
 # CONFIG_SPARSEMEM_MANUAL is not set
 CONFIG_SPI=y
 # CONFIG_SPI_BITBANG is not set
@@ -1590,7 +1570,6 @@ CONFIG_TCP_CONG_CUBIC=y
 CONFIG_TICK_ONESHOT=y
 # CONFIG_TIGON3 is not set
 CONFIG_TIMERFD=y
-CONFIG_TIMER_STATS=y
 # CONFIG_TIPC is not set
 # CONFIG_TLAN is not set
 CONFIG_TMPFS=y
@@ -1645,7 +1624,6 @@ CONFIG_UIO=y
 # CONFIG_UIO_AEC is not set
 # CONFIG_UIO_CIF is not set
 CONFIG_UIO_DOVE_VPRO=y
-CONFIG_UIO_DOVE_VPRO_MEM_SIZE=96
 CONFIG_UIO_PDRV=y
 # CONFIG_UIO_PDRV_GENIRQ is not set
 # CONFIG_UIO_SERCOS3 is not set
@@ -1762,7 +1740,6 @@ CONFIG_USB_STORAGE_SDDR09=y
 CONFIG_USB_STORAGE_SDDR55=y
 # CONFIG_USB_STORAGE_USBAT is not set
 CONFIG_USB_SUPPORT=y
-CONFIG_USB_SUSPEND=y
 CONFIG_USB_TEST=m
 # CONFIG_USB_TMC is not set
 # CONFIG_USB_TRANCEVIBRATOR is not set
diff --git a/debian.mvl-dove/control.d/vars.dove-z0 b/debian.mvl-dove/control.d/vars.dove-z0
new file mode 100644
index 0000000..e738e76
--- /dev/null
+++ b/debian.mvl-dove/control.d/vars.dove-z0
@@ -0,0 +1,9 @@
+arch="armel"
+supported="dove"
+desc="dove-based systems"
+target="Marvell, dove, z0 boards"
+bootloader=""
+provides=""
+section_image="universe/base"
+do_debug="Yes"
+
diff --git a/debian.mvl-dove/d-i/kernel-versions.in b/debian.mvl-dove/d-i/kernel-versions.in
index d148fa7..b159b5d 100644
--- a/debian.mvl-dove/d-i/kernel-versions.in
+++ b/debian.mvl-dove/d-i/kernel-versions.in
@@ -1,2 +1,3 @@
 # arch	version		flavour		installedname			suffix	bdep
 armel	PKGVER-ABINUM	dove		PKGVER-ABINUM-dove			y
+armel	PKGVER-ABINUM	dove-z0		PKGVER-ABINUM-dove			y
diff --git a/debian.mvl-dove/rules.d/armel.mk b/debian.mvl-dove/rules.d/armel.mk
index 7c53f02..af8c99d 100644
--- a/debian.mvl-dove/rules.d/armel.mk
+++ b/debian.mvl-dove/rules.d/armel.mk
@@ -2,7 +2,7 @@ build_arch	= arm
 header_arch	= arm
 asm_link	= arm
 defconfig	= defconfig
-flavours	= dove
+flavours	= dove dove-z0
 build_image	= uImage
 kernel_file	= arch/$(build_arch)/boot/uImage
 install_file	= vmlinuz
diff --git a/debian.mvl-dove/scripts/misc/getabis b/debian.mvl-dove/scripts/misc/getabis
index 27d78a7..ea93698 100755
--- a/debian.mvl-dove/scripts/misc/getabis
+++ b/debian.mvl-dove/scripts/misc/getabis
@@ -71,6 +71,6 @@ echo $abi > $abidir/abiname
 # NOTE: The flavours are hardcoded, because they may have changed from the
 # current build.
 
-getall armel dove
+getall armel dove dove-z0
 
 rmdir $tmpdir
-- 
1.6.0.4





More information about the kernel-team mailing list