From 28c06cd45d6a08b347bc2a8cf78c2382f77fbf30 Mon Sep 17 00:00:00 2001 From: Cliff Brake Date: Mon, 4 Feb 2008 22:04:14 +0000 Subject: gesbc-9302, linux-2.6.24: update gesbc-9302 to 2.6.24 released kernel version --- conf/machine/gesbc-9302.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'conf/machine') diff --git a/conf/machine/gesbc-9302.conf b/conf/machine/gesbc-9302.conf index ce45606dbd..af64a31d8b 100644 --- a/conf/machine/gesbc-9302.conf +++ b/conf/machine/gesbc-9302.conf @@ -6,7 +6,7 @@ TARGET_ARCH = "arm" PACKAGE_EXTRA_ARCHS = "armv4t" PREFERRED_PROVIDER_virtual/kernel = "linux" -PREFERRED_VERSION_linux ?= "2.6.23+2.6.24-rc5" +PREFERRED_VERSION_linux ?= "2.6.24" #don't try to access tty1 USE_VT = "0" -- cgit v1.2.3 From 15f1db4fe643029378eec118e38f5aa40c5cd6a4 Mon Sep 17 00:00:00 2001 From: Rod Whitby Date: Tue, 5 Feb 2008 05:42:33 +0000 Subject: ixp4xx.inc: Move default ixp4xx kernel to 2.6.24 --- conf/machine/include/ixp4xx.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'conf/machine') diff --git a/conf/machine/include/ixp4xx.inc b/conf/machine/include/ixp4xx.inc index 924fb54f1e..da1e8b7557 100644 --- a/conf/machine/include/ixp4xx.inc +++ b/conf/machine/include/ixp4xx.inc @@ -7,7 +7,7 @@ MACHINE_FEATURES ?= "kernel26 usbhost ext2 vfat redboot apex" # Select an appropriate default kernel PREFERRED_PROVIDER_virtual/kernel ?= "linux-ixp4xx" -PREFERRED_VERSION_linux-ixp4xx ?= "2.6.23.14+svnr${SRCREV}" +PREFERRED_VERSION_linux-ixp4xx ?= "2.6.24+svnr${SRCREV}" # Add packages required for basic networking support MACHINE_ESSENTIAL_EXTRA_RDEPENDS ?= "ixp4xx-npe" -- cgit v1.2.3 From baaba6900900fe9815089d25270665899e2576a6 Mon Sep 17 00:00:00 2001 From: Paul Sokolovsky Date: Tue, 5 Feb 2008 09:17:01 +0000 Subject: h5000.conf: Ship BT module. * Fixes #3549 * Based on the patch by Michal Panczyk --- conf/machine/h5000.conf | 1 + 1 file changed, 1 insertion(+) (limited to 'conf/machine') diff --git a/conf/machine/h5000.conf b/conf/machine/h5000.conf index 1f29438061..e795395534 100644 --- a/conf/machine/h5000.conf +++ b/conf/machine/h5000.conf @@ -27,6 +27,7 @@ EXTRA_IMAGECMD_jffs2 = "-e 0x40000 -p ; echo '${IMAGE_NAME} ${IMAGE_NAME}.rootf MACHINE_EXTRA_RDEPENDS = "kernel ipaq-boot-params" MACHINE_EXTRA_RRECOMMENDS = " kernel-module-h5400-lcd \ kernel-module-h5400-battery \ + kernel-module-h5400-bt \ kernel-module-snd-soc-h5000 \ kernel-module-i2c-pxa" -- cgit v1.2.3 From 6853e674e42ffa97b62d6354c38d15b075956ecd Mon Sep 17 00:00:00 2001 From: Florian Boor Date: Thu, 7 Feb 2008 13:03:18 +0000 Subject: netvista.conf: Use generic kernel recipe instead of always broken linux-x86. --- conf/machine/netvista.conf | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'conf/machine') diff --git a/conf/machine/netvista.conf b/conf/machine/netvista.conf index 3ee97a447e..f95e403367 100644 --- a/conf/machine/netvista.conf +++ b/conf/machine/netvista.conf @@ -1,12 +1,12 @@ #@TYPE: Machine -#@NAME: X86 -#@DESCRIPTION: Machine configuration for a Linux running on x86 compatible machines +#@NAME: Netvista J320 Internet Applicance +#@DESCRIPTION: Machine configuration for a Linux IBM 8365 / J320 PC-based internet terminals -# i386 doesn't work with NTPL, see http://ecos.sourceware.org/ml/libc-ports/2006-03/msg00030.html TARGET_ARCH = "i486" -# TARGET_VENDOR = "-oe" PACKAGE_EXTRA_ARCHS = "netvista" -PREFERRED_PROVIDER_virtual/kernel = "linux-x86" +PREFERRED_PROVIDER_virtual/kernel = "linux" +PREFERRED_VERSION_linux = "2.6.23" + XSERVER = "xserver-kdrive-vesa" KERNEL_IMAGETYPE = "bzImage" -- cgit v1.2.3 From 081bf6fbe9c04faa1b70ca25409666a00bf9d21c Mon Sep 17 00:00:00 2001 From: Graeme Gregory Date: Thu, 7 Feb 2008 14:28:16 +0000 Subject: fic-gta02.conf : dont ship smdk2440 sound drivers --- conf/machine/fic-gta02.conf | 1 - 1 file changed, 1 deletion(-) (limited to 'conf/machine') diff --git a/conf/machine/fic-gta02.conf b/conf/machine/fic-gta02.conf index bd9621413a..2c2034b1b6 100644 --- a/conf/machine/fic-gta02.conf +++ b/conf/machine/fic-gta02.conf @@ -26,7 +26,6 @@ MACHINE_EXTRA_RRECOMMENDS = "\ kernel-module-gta01kbd \ kernel-module-s3cmci \ kernel-module-snd-soc-neo1973-gta02-wm8753 \ - kernel-module-snd-soc-smdk2440 \ " SERIAL_CONSOLE = "115200 ttySAC2" -- cgit v1.2.3 From 0313defa39c55357c11368006acc957ee9ea5cb9 Mon Sep 17 00:00:00 2001 From: Philip Balister Date: Thu, 7 Feb 2008 20:12:29 +0000 Subject: gumstix-machine : Update gumstix machine files from gumstix OE collection. --- conf/machine/gumstix-custom-connex.conf | 75 +++++++++++++++++++++++++++++++ conf/machine/gumstix-custom-verdex.conf | 78 +++++++++++++++++++++++++++++++++ conf/machine/include/gumstix.inc | 60 ++++++++++++------------- 3 files changed, 181 insertions(+), 32 deletions(-) create mode 100644 conf/machine/gumstix-custom-connex.conf create mode 100644 conf/machine/gumstix-custom-verdex.conf (limited to 'conf/machine') diff --git a/conf/machine/gumstix-custom-connex.conf b/conf/machine/gumstix-custom-connex.conf new file mode 100644 index 0000000000..1b854582f8 --- /dev/null +++ b/conf/machine/gumstix-custom-connex.conf @@ -0,0 +1,75 @@ +# +# Use this file as a starting point for your custom gumstix configuration +# Edit it to reflect your hardware setup and then save it a parallel location in user.collection + +MACHINE_FEATURES += "connex" +require conf/machine/include/gumstix.inc +require conf/machine/include/tune-xscale.inc + +# +# Your flash size = Total flash (in MB) - 1 (for linux kernel partition) +#ROOT_FLASH_SIZE = "3" +ROOT_FLASH_SIZE = "15" + +# +# Enable use of virtual terminal for LCD on tty1 if USE_VT = "1" +USE_VT = "0" +#USE_VT = "1" +#SYSVINIT_ENABLED_GETTYS = "1" + +# +# Uncomment features that your board set supports + +#MACHINE_FEATURES += "usbhost" +MACHINE_FEATURES += "usbgadget" + +MACHINE_FEATURES += "i2c" +#MACHINE_FEATURES += "spi" + +MACHINE_FEATURES += "serial" +MACHINE_FEATURES += "bluetooth" +MACHINE_FEATURES += "sound" + +# if you enable robostix you will need to disable both "lcd" and "touchscreen" features +#MACHINE_FEATURES += "robostix" + +#MACHINE_FEATURES += "lcd" +#MACHINE_FEATURES += "touchscreen" +#MACHINE_FEATURES += "keyboard" + +MACHINE_FEATURES += "pcmcia" +#MACHINE_FEATURES += "mmc" + +MACHINE_FEATURES += "wifi" +MACHINE_FEATURES += "ethernet" + +MACHINE_FEATURES += "fat" +#MACHINE_FEATURES += "ext2" + +# +# note: selection of MACHINE_FEATURES above will automatically include necessary kernel modules +# for those features via task-base-gumstix. Include below any extra kernel modules that you want installed + +#MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS += "kernel-module-xxxxxxx" + +# +# Uncomment or add kernel modules that should be autoloaded + +module_autoload_proc_gpio = 'proc_gpio' + +module_autoload_pcmcia = ${@base_contains('MACHINE_FEATURES', 'pcmcia', 'pcmcia', '',d)} +module_autoload_pxa2xx_cs = ${@base_contains('MACHINE_FEATURES', 'pcmcia', 'pxa2xx_cs', '',d)} + +module_autoload_pxamci = ${@base_contains('MACHINE_FEATURES', 'mmc', 'pxamci', '',d)} +module_autoload_mmc_block = ${@base_contains('MACHINE_FEATURES', 'mmc', 'mmc_block', '',d)} + +module_autoload_ethernet = ${@base_contains('MACHINE_FEATURES', 'ethernet', 'ethernet', '',d)} + +module_autoload_gumstix_gadget = ${@base_contains('MACHINE_FEATURES', 'usbgadget', 'gumstix_gadget', '',d)} +#module_autoload_g_file_storage = ${@base_contains('MACHINE_FEATURES', 'usbgadget', 'g_file_storage', '',d)} +module_autoload_g_ether = ${@base_contains('MACHINE_FEATURES', 'usbgadget', 'g_ether', '',d)} +#module_autoload_g_serial = ${@base_contains('MACHINE_FEATURES', 'usbgadget', 'g_serial', '',d)} + +module_autoload_ucb1400-ts = ${@base_contains('MACHINE_FEATURES', 'touchscreen','ucb1400-ts', '',d)} +module_autoload_evdev = ${@base_contains('MACHINE_FEATURES', 'touchscreen','evdev', '',d)} + diff --git a/conf/machine/gumstix-custom-verdex.conf b/conf/machine/gumstix-custom-verdex.conf new file mode 100644 index 0000000000..f2488d66e1 --- /dev/null +++ b/conf/machine/gumstix-custom-verdex.conf @@ -0,0 +1,78 @@ +# +# Use this file as a starting point for your custom gumstix configuration +# Edit it to reflect your hardware setup and then save it a parallel location in user.collection + +MACHINE_FEATURES += "verdex" +MACHINE_FEATURES += "iwmmxt" +require conf/machine/include/gumstix.inc +require conf/machine/include/tune-xscale.inc + +# +# Your flash size = Total flash (in MB) - 1 (for linux kernel partition) +ROOT_FLASH_SIZE = "15" +#ROOT_FLASH_SIZE = "31" + +# +# Enable use of virtual terminal for LCD on tty1 if USE_VT = "1" +#USE_VT = "0" +USE_VT = "1" +SYSVINIT_ENABLED_GETTYS = "1" + +# +# Uncomment features that your board set supports + +MACHINE_FEATURES += "usbhost" +#MACHINE_FEATURES += "usbgadget" + +MACHINE_FEATURES += "i2c" +#MACHINE_FEATURES += "spi" + +MACHINE_FEATURES += "serial" +MACHINE_FEATURES += "bluetooth" +MACHINE_FEATURES += "sound" + +# if you enable robostix you will need to disable both "lcd" and "touchscreen" features +#MACHINE_FEATURES += "robostix" + +MACHINE_FEATURES += "lcd" +MACHINE_FEATURES += "touchscreen" +MACHINE_FEATURES += "keyboard" + +MACHINE_FEATURES += "pcmcia" +MACHINE_FEATURES += "mmc" + +MACHINE_FEATURES += "wifi" +MACHINE_FEATURES += "ethernet" + +MACHINE_FEATURES += "ext2" +MACHINE_FEATURES += "fat" + +# +# note: selection of MACHINE_FEATURES above will automatically include necessary kernel modules +# for those features via task-base-gumstix. Include below any extra kernel modules that you want installed + +#MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS += "kernel-module-xxxxxxx" + +# +# Uncomment or add kernel modules that should be autoloaded + +module_autoload_proc_gpio = 'proc_gpio' + +module_autoload_pcmcia = ${@base_contains('MACHINE_FEATURES', 'pcmcia', 'pcmcia', '',d)} +module_autoload_pxa2xx_cs = ${@base_contains('MACHINE_FEATURES', 'pcmcia', 'pxa2xx_cs', '',d)} + +module_autoload_pxamci = ${@base_contains('MACHINE_FEATURES', 'mmc', 'pxamci', '',d)} +module_autoload_mmc_block = ${@base_contains('MACHINE_FEATURES', 'mmc', 'mmc_block', '',d)} + +module_autoload_ethernet = ${@base_contains('MACHINE_FEATURES', 'ethernet', 'ethernet', '',d)} + +module_autoload_ohci-hcd = ${@base_contains('MACHINE_FEATURES', 'usbhost', 'ohci-hcd', '',d)} + +module_autoload_gumstix_gadget = ${@base_contains('MACHINE_FEATURES', 'usbgadget', 'gumstix_gadget', '',d)} +#module_autoload_g_file_storage = ${@base_contains('MACHINE_FEATURES', 'usbgadget', 'g_file_storage', '',d)} +module_autoload_g_ether = ${@base_contains('MACHINE_FEATURES', 'usbgadget', 'g_ether', '',d)} +#module_autoload_g_serial = ${@base_contains('MACHINE_FEATURES', 'usbgadget', 'g_serial', '',d)} + +module_autoload_tsc2003 = ${@base_contains('MACHINE_FEATURES', 'touchscreen','tsc2003', '',d)} +module_autoload_evdev = ${@base_contains('MACHINE_FEATURES', 'touchscreen','evdev', '',d)} + diff --git a/conf/machine/include/gumstix.inc b/conf/machine/include/gumstix.inc index fc5fd4e136..1bc0b2e000 100644 --- a/conf/machine/include/gumstix.inc +++ b/conf/machine/include/gumstix.inc @@ -2,47 +2,43 @@ #@Name: Gumstix pxa2xx boards #@DESCRIPTION: Gumstix pxa2xx boards +# Don't edit this file unless you *really* know what you are doing! + TARGET_ARCH = "arm" PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5e armv5te " -PREFERRED_PROVIDER_virtual/kernel = "linux" +PREFERRED_PROVIDER_virtual/kernel = "gumstix-kernel" KERNEL_IMAGETYPE = "uImage" - -module_autoload_pxamci = "pxamci" -module_autoload_mmc_block = "mmc_block" -module_autoload_gumstix_gadget = "gumstix_gadget" -module_autoload_g_ether = "g_ether" -module_autoload_smc91x = "smc91x" -module_autoload_smc911x = "smc911x" +RDEPENDS_kernel-base = "" +KERNEL_IMAGE_MAXSIZE = "1048577" UBOOT_ENTRYPOINT = "a0008000" -#Assume people have some gumstix extension boards -MACHINE_FEATURES = "kernel26 alsa ext2 bluetooth" - -EXTRA_IMAGECMD_jffs2 = "--little-endian --eraseblock=0x20000 --squash" +MACHINE_FEATURES += "kernel26 " +COMBINED_FEATURES ?= "" -# Install all kernel modules -#MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS = "kernel-modules" +IMAGE_FSTYPES = "jffs2" +EXTRA_IMAGECMD_jffs2 = "--little-endian --eraseblock=0x20000 --squash-uids" -# Install only selected kernel modules, comment out line above also -MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS = "kernel-module-unix \ - kernel-module-rtc-core \ - kernel-module-rtc-dev \ - kernel-module-rtc-proc \ - kernel-module-rtc-sa1100 \ - kernel-module-rtc-sysfs \ - kernel-module-smc91x \ - kernel-module-gumstix-smc91x \ - kernel-module-smc911x \ - kernel-module-gumstix-smc911x \ - " - -# used by sysvinit_2 SERIAL_CONSOLE = "115200 ttyS0 vt100" -#don't try to access tty1 -USE_VT = "0" - -require conf/machine/include/tune-xscale.inc +MACHINE_ESSENTIAL_EXTRA_RDEPENDS = " \ + " + +MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS ?= " \ + " +# +# The following *should* be in a distro.conf file +# We include them here to avoid creating a new distro + +PREFERRED_VERSION_gumstix-kernel = "2.6.21" +PREFERRED_VERSION_udev = "115" +PREFERRED_VERSION_gnuplot = "4.0.0" +PREFERRED_VERSION_dropbear = "0.47" +PREFERRED_VERSION_wpa-supplicant = "0.5.8" +PREFERRED_VERSION_bluez-utils = "3.24" +PREFERRED_VERSION_bluez-utils-alsa = "3.24" +PREFERRED_VERSION_bluez-libs = "3.24" +PREFERRED_VERSION_bluez-gstreamer-plugin = "3.24" +PREFERRED_VERSION_bluez-hcidump = "1.40" -- cgit v1.2.3 From 45e943b2847802ed8600ad471b870e7a732f6a78 Mon Sep 17 00:00:00 2001 From: Paul Sokolovsky Date: Sat, 9 Feb 2008 12:23:53 +0000 Subject: conf/machine/: Add jffs2 as default image for embedded boards and vendor machines. * Based on the list provided by Richard Purdie, skipping devices (pocketpc and palms), ports of which are completely generic and jffs2 is completely not a better choice than any other. --- conf/machine/at32stk1000.conf | 1 + conf/machine/at91sam9260ek.conf | 1 + conf/machine/at91sam9261ek.conf | 1 + conf/machine/at91sam9263ek.conf | 2 +- conf/machine/bd-neon.conf | 1 + conf/machine/fic-gta01.conf | 1 + conf/machine/gesbc-9302.conf | 1 + conf/machine/include/motorola-ezx-base.inc | 1 + conf/machine/omap1510inn.conf | 1 + conf/machine/omap1610h2.conf | 1 + conf/machine/omap1710h3.conf | 1 + conf/machine/omap2420h4.conf | 1 + conf/machine/omap2430sdp.conf | 1 + conf/machine/omap5912osk.conf | 1 + conf/machine/shark.conf | 1 + conf/machine/triton.conf | 1 + conf/machine/xxs1500.conf | 1 + 17 files changed, 17 insertions(+), 1 deletion(-) (limited to 'conf/machine') diff --git a/conf/machine/at32stk1000.conf b/conf/machine/at32stk1000.conf index 4c3112df78..add4c7e2d9 100644 --- a/conf/machine/at32stk1000.conf +++ b/conf/machine/at32stk1000.conf @@ -17,6 +17,7 @@ MACHINE_FEATURES = "kernel26 alsa ext2 usbgadget touchscreen screen" SERIAL_CONSOLE = "115200" # used by some images +IMAGE_FSTYPES ?= "jffs2" ROOT_FLASH_SIZE = "8" EXTRA_IMAGECMD_jffs2 = " --big-endian --pagesize=4096 --eraseblock=65536" diff --git a/conf/machine/at91sam9260ek.conf b/conf/machine/at91sam9260ek.conf index 07616915aa..ba0c9f9a70 100644 --- a/conf/machine/at91sam9260ek.conf +++ b/conf/machine/at91sam9260ek.conf @@ -17,6 +17,7 @@ MACHINE_FEATURES = "kernel26 alsa ext2 usbhost usbgadget" # used by sysvinit_2 SERIAL_CONSOLE = "115200 ttyS0" +IMAGE_FSTYPES ?= "jffs2" EXTRA_IMAGECMD_jffs2 = "--pad --little-endian --eraseblock=0x20000 -n" require conf/machine/include/tune-arm926ejs.inc diff --git a/conf/machine/at91sam9261ek.conf b/conf/machine/at91sam9261ek.conf index b6ccd7ef0d..3b9d5188f6 100644 --- a/conf/machine/at91sam9261ek.conf +++ b/conf/machine/at91sam9261ek.conf @@ -17,6 +17,7 @@ MACHINE_FEATURES = "kernel26 alsa ext2 usbhost usbgadget screen touchscreen" # used by sysvinit_2 SERIAL_CONSOLE = "115200 ttyS0" +IMAGE_FSTYPES ?= "jffs2" EXTRA_IMAGECMD_jffs2 = "--pad --little-endian --eraseblock=0x20000 -n" require conf/machine/include/tune-arm926ejs.inc diff --git a/conf/machine/at91sam9263ek.conf b/conf/machine/at91sam9263ek.conf index bf45d25c43..95c7626a63 100644 --- a/conf/machine/at91sam9263ek.conf +++ b/conf/machine/at91sam9263ek.conf @@ -15,7 +15,7 @@ MACHINE_FEATURES = "kernel26 alsa ext2 usbhost usbgadget screen" # used by sysvinit_2 SERIAL_CONSOLE = "115200 ttyS0" - +IMAGE_FSTYPES ?= "jffs2" EXTRA_IMAGECMD_jffs2 = "--pad --little-endian --eraseblock=0x20000 -n" require conf/machine/include/tune-arm926ejs.inc diff --git a/conf/machine/bd-neon.conf b/conf/machine/bd-neon.conf index 532193a567..f875d437c7 100644 --- a/conf/machine/bd-neon.conf +++ b/conf/machine/bd-neon.conf @@ -41,6 +41,7 @@ MACHINE_EXTRA_RRECOMMENDS = " kernel-modules kernel-module-nls-cp437 \ kernel-module-af-key \ kernel-module-i2c-pxa" +IMAGE_FSTYPES ?= "jffs2" EXTRA_IMAGECMD_jffs2 = "--little-endian --eraseblock=0x20000 -n" EXTRA_IMAGECMD_jffs2 = "--little-endian --eraseblock=0x40000 --pad=32243712; sumtool -i ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2 \ -o ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs-summary.jffs2 \ diff --git a/conf/machine/fic-gta01.conf b/conf/machine/fic-gta01.conf index ad0c64bef2..bfaf5ed793 100644 --- a/conf/machine/fic-gta01.conf +++ b/conf/machine/fic-gta01.conf @@ -36,6 +36,7 @@ MACHINE_EXTRA_RRECOMMENDS = "\ ROOT_FLASH_SIZE = "60" # extra jffs2 tweaks +IMAGE_FSTYPES ?= "jffs2" EXTRA_IMAGECMD_jffs2 = "--little-endian --eraseblock=0x4000 --pad -n" # build / upload tools diff --git a/conf/machine/gesbc-9302.conf b/conf/machine/gesbc-9302.conf index af64a31d8b..ac4c1ef4b6 100644 --- a/conf/machine/gesbc-9302.conf +++ b/conf/machine/gesbc-9302.conf @@ -19,6 +19,7 @@ SERIAL_CONSOLE = "57600 ttyAM0" # used by some images ROOT_FLASH_SIZE = "8" #extra jffs2 tweaks +IMAGE_FSTYPES ?= "jffs2" EXTRA_IMAGECMD_jffs2 = "--eraseblock=0x40000 --pad=0x500000 " #tune for ep93xx cpus diff --git a/conf/machine/include/motorola-ezx-base.inc b/conf/machine/include/motorola-ezx-base.inc index da88b1494f..a9945acd34 100644 --- a/conf/machine/include/motorola-ezx-base.inc +++ b/conf/machine/include/motorola-ezx-base.inc @@ -22,6 +22,7 @@ MACHINE_DISPLAY_PPI = "180" ROOT_FLASH_SIZE = "24" +IMAGE_FSTYPES ?= "jffs2" EXTRA_IMAGECMD_jffs2 = "--pad=14680064 --little-endian --eraseblock=0x20000 -n" EXTRA_IMAGEDEPENDS += "ezx-boot-usb-native" diff --git a/conf/machine/omap1510inn.conf b/conf/machine/omap1510inn.conf index 3dc19a4a31..ffec67b699 100644 --- a/conf/machine/omap1510inn.conf +++ b/conf/machine/omap1510inn.conf @@ -12,6 +12,7 @@ PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}depmod:module-init-tools-cross" BOOTSTRAP_EXTRA_RDEPENDS += "modutils-collateral" SERIAL_CONSOLE ?= "115200 ttyS0" +IMAGE_FSTYPES ?= "jffs2" EXTRA_IMAGECMD_jffs2 = "--pad --little-endian --eraseblock=0x40000" require conf/machine/include/tune-arm926ejs.inc diff --git a/conf/machine/omap1610h2.conf b/conf/machine/omap1610h2.conf index 3dc19a4a31..ffec67b699 100644 --- a/conf/machine/omap1610h2.conf +++ b/conf/machine/omap1610h2.conf @@ -12,6 +12,7 @@ PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}depmod:module-init-tools-cross" BOOTSTRAP_EXTRA_RDEPENDS += "modutils-collateral" SERIAL_CONSOLE ?= "115200 ttyS0" +IMAGE_FSTYPES ?= "jffs2" EXTRA_IMAGECMD_jffs2 = "--pad --little-endian --eraseblock=0x40000" require conf/machine/include/tune-arm926ejs.inc diff --git a/conf/machine/omap1710h3.conf b/conf/machine/omap1710h3.conf index 9a97150981..98e3a7d3e5 100644 --- a/conf/machine/omap1710h3.conf +++ b/conf/machine/omap1710h3.conf @@ -12,6 +12,7 @@ PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}depmod:module-init-tools-cross" BOOTSTRAP_EXTRA_RDEPENDS += "modutils-collateral" SERIAL_CONSOLE ?= "115200 ttyS0" +IMAGE_FSTYPES ?= "jffs2" EXTRA_IMAGECMD_jffs2 = "--pad --little-endian --eraseblock=0x40000" require conf/machine/include/tune-arm926ejs.inc diff --git a/conf/machine/omap2420h4.conf b/conf/machine/omap2420h4.conf index 82be4e3f79..343b0091b5 100644 --- a/conf/machine/omap2420h4.conf +++ b/conf/machine/omap2420h4.conf @@ -9,6 +9,7 @@ PREFERRED_PROVIDER_virtual/kernel = "linux-omap2" PREFERRED_VERSION_u-boot = "1.1.4" SERIAL_CONSOLE ?= "115200 ttyS0" +IMAGE_FSTYPES ?= "jffs2" EXTRA_IMAGECMD_jffs2 = "--pad --little-endian --eraseblock=0x40000" MACHINE_FEATURES = "kernel26" diff --git a/conf/machine/omap2430sdp.conf b/conf/machine/omap2430sdp.conf index 39e6896b3b..0e6b646897 100644 --- a/conf/machine/omap2430sdp.conf +++ b/conf/machine/omap2430sdp.conf @@ -9,6 +9,7 @@ PREFERRED_PROVIDER_virtual/kernel = "linux-omap2" PREFERRED_VERSION_u-boot = "1.1.4" SERIAL_CONSOLE ?= "115200 ttyS0" +IMAGE_FSTYPES ?= "jffs2" EXTRA_IMAGECMD_jffs2 = "--pad --little-endian --eraseblock=0x40000" MACHINE_FEATURES = "kernel26" diff --git a/conf/machine/omap5912osk.conf b/conf/machine/omap5912osk.conf index abd50b116a..7a7b5c1a60 100644 --- a/conf/machine/omap5912osk.conf +++ b/conf/machine/omap5912osk.conf @@ -11,6 +11,7 @@ PREFERRED_PROVIDER_virtual/kernel = "linux-omap1" # PREFERRED_VERSION_u-boot = "1.1.6" SERIAL_CONSOLE ?= "115200 ttyS0" +IMAGE_FSTYPES ?= "jffs2" EXTRA_IMAGECMD_jffs2 = "--pad --little-endian --eraseblock=0x20000 -n" ROOT_FLASH_SIZE = "29" diff --git a/conf/machine/shark.conf b/conf/machine/shark.conf index d7d35cfda1..3b9165d2b8 100644 --- a/conf/machine/shark.conf +++ b/conf/machine/shark.conf @@ -8,6 +8,7 @@ TARGET_ARCH = "arm" PREFERRED_PROVIDER_xserver = "xserver-kdrive" PREFERRED_PROVIDER_virtual/kernel = "linux-z" +IMAGE_FSTYPES ?= "jffs2" EXTRA_IMAGECMD_jffs2 = "--little-endian --eraseblock=0x20000 -n" EXTRA_IMAGEDEPENDS = "" SERIAL_CONSOLE = "ttySA0 115200 vt100" diff --git a/conf/machine/triton.conf b/conf/machine/triton.conf index 2dbe3ea863..0275f6b2f5 100644 --- a/conf/machine/triton.conf +++ b/conf/machine/triton.conf @@ -8,6 +8,7 @@ PREFERRED_PROVIDER_virtual/kernel = "triton-kernel" BOOTSTRAP_EXTRA_RDEPENDS = "virtual/kernel" +IMAGE_FSTYPES ?= "jffs2" EXTRA_IMAGECMD_jffs2 = "--pad=0x1dc0000 --little-endian --eraseblock=0x40000 -n" EXTRA_IMAGEDEPENDS = "" SERIAL_CONSOLE = "38400 ttyS0" diff --git a/conf/machine/xxs1500.conf b/conf/machine/xxs1500.conf index 9cc47cdef7..4d5909126a 100644 --- a/conf/machine/xxs1500.conf +++ b/conf/machine/xxs1500.conf @@ -8,6 +8,7 @@ TARGET_ARCH = "mipsel" PREFERRED_PROVIDER_virtual/kernel = "linux-xxs1500" +IMAGE_FSTYPES ?= "jffs2" EXTRA_IMAGECMD_jffs2 = "--pad=0xa00000 --little-endian --eraseblock=0x20000 -n" # does not gain any speed and just creates problems: -- cgit v1.2.3 From 3326472c3a600c74d0acd5c4b1ec3588ca30aad8 Mon Sep 17 00:00:00 2001 From: Leon Woestenberg Date: Mon, 11 Feb 2008 21:16:03 +0000 Subject: mpc8313e-rdb.conf: Add UBOOT_ENTRYPOINT and UBOOT_LOADADDRESS. --- conf/machine/mpc8313e-rdb.conf | 2 ++ 1 file changed, 2 insertions(+) (limited to 'conf/machine') diff --git a/conf/machine/mpc8313e-rdb.conf b/conf/machine/mpc8313e-rdb.conf index 27706cbd4a..a43f621406 100644 --- a/conf/machine/mpc8313e-rdb.conf +++ b/conf/machine/mpc8313e-rdb.conf @@ -14,6 +14,8 @@ KERNEL_IMAGETYPE = "uImage" PREFERRED_VERSION_u-boot = "1.3.1" UBOOT_MACHINE = "MPC8313ERDB_33_config" +UBOOT_ENTRYPOINT = "0" +UBOOT_LOADADDRESS = "0" #rootfs on NAND flash EXTRA_IMAGECMD_jffs2 = "--pad --big-endian --eraseblock=0x4000 --no-cleanmarkers" -- cgit v1.2.3