From cc93b59948038ddfec94543ca8397309a80600a5 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Sun, 12 Aug 2007 08:31:02 +0000 Subject: at32stk1000, atngw100: fix machine features and uboot version --- conf/machine/at32stk1000.conf | 4 +++- conf/machine/atngw100.conf | 3 ++- 2 files changed, 5 insertions(+), 2 deletions(-) (limited to 'conf') diff --git a/conf/machine/at32stk1000.conf b/conf/machine/at32stk1000.conf index faa4785fb4..5acc5b88fe 100644 --- a/conf/machine/at32stk1000.conf +++ b/conf/machine/at32stk1000.conf @@ -11,7 +11,7 @@ PREFERRED_PROVIDER_xserver = "xserver-kdrive" #don't try to access tty1 USE_VT = "0" -MACHINE_FEATURES = "kernel26 alsa ext2 usbhost usbgadget screen" +MACHINE_FEATURES = "kernel26 alsa ext2 usbgadget touchscreen screen" # used by sysvinit_2 SERIAL_CONSOLE = "115200" @@ -19,3 +19,5 @@ SERIAL_CONSOLE = "115200" # used by some images ROOT_FLASH_SIZE = "8" EXTRA_IMAGECMD_jffs2 = " --big-endian --pagesize=4096 --eraseblock=65536" + +PREFERRED_VERSION_u-boot = "1.1.4" diff --git a/conf/machine/atngw100.conf b/conf/machine/atngw100.conf index b725831321..833282d468 100644 --- a/conf/machine/atngw100.conf +++ b/conf/machine/atngw100.conf @@ -9,7 +9,7 @@ PREFERRED_PROVIDER_xserver = "xserver-kdrive" #don't try to access tty1 USE_VT = "0" -MACHINE_FEATURES = "kernel26 ext2 usbhost usbgadget" +MACHINE_FEATURES = "kernel26 ext2 usbgadget" # used by sysvinit_2 SERIAL_CONSOLE = "115200" @@ -18,3 +18,4 @@ SERIAL_CONSOLE = "115200" ROOT_FLASH_SIZE = "8" EXTRA_IMAGECMD_jffs2 = " --big-endian --pagesize=4096 --eraseblock=65536" +PREFERRED_VERSION_u-boot = "1.1.4" -- cgit v1.2.3 From 4d76ff2e324f46d4aa330658566a19f59755b751 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Fri, 14 Sep 2007 07:49:12 +0000 Subject: avr32 machines: remove uImage from rootfs, needs a better way --- conf/machine/at32stk1000.conf | 4 +++- conf/machine/atngw100.conf | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) (limited to 'conf') diff --git a/conf/machine/at32stk1000.conf b/conf/machine/at32stk1000.conf index 21ffdda843..343c6aa44e 100644 --- a/conf/machine/at32stk1000.conf +++ b/conf/machine/at32stk1000.conf @@ -21,5 +21,7 @@ ROOT_FLASH_SIZE = "8" EXTRA_IMAGECMD_jffs2 = " --big-endian --pagesize=4096 --eraseblock=65536" KERNEL_IMAGETYPE = "uImage" +PREFERRED_VERSION_u-boot = "1.1.4" + +ROOTFS_POSTPROCESS_COMMAND += " rm ${IMAGE_ROOTFS}/boot/uImage* ;" -PREFERRED_VERSION_u-boot = "1.1.4" \ No newline at end of file diff --git a/conf/machine/atngw100.conf b/conf/machine/atngw100.conf index 76453323ff..6acc3d7907 100644 --- a/conf/machine/atngw100.conf +++ b/conf/machine/atngw100.conf @@ -19,4 +19,6 @@ ROOT_FLASH_SIZE = "8" EXTRA_IMAGECMD_jffs2 = " --big-endian --pagesize=4096 --eraseblock=65536" PREFERRED_VERSION_u-boot = "1.1.4" -KERNEL_IMAGETYPE = "uImage" \ No newline at end of file +KERNEL_IMAGETYPE = "uImage" + +ROOTFS_POSTPROCESS_COMMAND += " rm ${IMAGE_ROOTFS}/boot/uImage* ;" -- cgit v1.2.3 From 43b6ecbcb39354a32e0b8dd7c02ec8789be0ab9a Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Sat, 20 Oct 2007 15:51:04 +0000 Subject: angstrom 2008: use proper gcc for avr32 --- conf/distro/angstrom-2008.1.conf | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) (limited to 'conf') diff --git a/conf/distro/angstrom-2008.1.conf b/conf/distro/angstrom-2008.1.conf index 046c63ad54..4d428fe3d8 100644 --- a/conf/distro/angstrom-2008.1.conf +++ b/conf/distro/angstrom-2008.1.conf @@ -47,4 +47,15 @@ PREFERRED_VERSION_udev = "115" # Our patched-to-hell busybox 1.2.1 is getting old and unmaintanable PREFERRED_VERSION_busybox = "1.7.2" - +PREFERRED_VERSION_pango = "1.18.1" +#avr32 only has patches for binutils 2.17 and gcc 4.1.2 in OE +PREFERRED_VERSION_gcc_avr32 = "4.1.2" +PREFERRED_VERSION_gcc-cross_avr32 = "4.1.2" +PREFERRED_VERSION_gcc-cross-sdk_avr32 = "4.1.2" +PREFERRED_VERSION_gcc-cross-initial_avr32 = "4.1.2" +PREFERRED_VERSION_binutils_avr32 = "2.17" +PREFERRED_VERSION_binutils-cross_avr32 = "2.17" +PREFERRED_VERSION_binutils-cross-sdk_avr32 = "2.17" +#there's is no avr32 patch for 0.9.29 +PREFERRED_VERSION_uclibc_avr32 = "0.9.28" +PREFERRED_VERSION_uclibc-initial_avr32 = "0.9.28" -- cgit v1.2.3 From 58d26610db472fbb79390238c84031994627bd9a Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Wed, 31 Oct 2007 18:47:47 +0000 Subject: angstrom: clean up avr32 bits --- conf/distro/angstrom-2007.1.conf | 14 -------------- conf/distro/angstrom-2008.1.conf | 4 ---- conf/distro/include/angstrom.inc | 2 ++ 3 files changed, 2 insertions(+), 18 deletions(-) (limited to 'conf') diff --git a/conf/distro/angstrom-2007.1.conf b/conf/distro/angstrom-2007.1.conf index fe6be3e614..7486400651 100644 --- a/conf/distro/angstrom-2007.1.conf +++ b/conf/distro/angstrom-2007.1.conf @@ -114,16 +114,6 @@ PREFERRED_VERSION_binutils ?= "2.18" PREFERRED_VERSION_binutils-cross ?= "2.18" PREFERRED_VERSION_binutils-cross-sdk ?= "2.18" -#avr32 only has patches for binutils 2.17 and gcc 4.1.2 in OE -PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}gcc_avr32 = "avr32-gcc-cross" -PREFERRED_VERSION_avr32-gcc = "4.1.2" -PREFERRED_VERSION_avr32-gcc-cross = "4.1.2" -PREFERRED_VERSION_gcc-cross-sdk_avr32 = "4.0.2" -PREFERRED_VERSION_gcc-cross-initial_avr32 = "4.0.2" - -PREFERRED_VERSION_binutils_avr32 = "2.17" -PREFERRED_VERSION_binutils-cross_avr32 = "2.17" -PREFERRED_VERSION_binutils-cross-sdk_avr32 = "2.17" #This is unrelated to the kernel version, but userspace apps (e.g. HAL) require a recent version to build against PREFERRED_VERSION_linux-libc-headers ?= "2.6.20" @@ -134,10 +124,6 @@ PREFERRED_VERSION_glibc ?= "2.5" PREFERRED_VERSION_uclibc ?= "0.9.29" PREFERRED_VERSION_uclibc-initial ?= "0.9.29" -#there's is no avr32 patch for 0.9.29 -PREFERRED_VERSION_uclibc_avr32 = "0.9.28" -PREFERRED_VERSION_uclibc-initial_avr32 = "0.9.28" - PREFERRED_VERSION_glibc-intermediate_i686 ?= "2.4" PREFERRED_VERSION_glibc-intermediate ?= "2.5" diff --git a/conf/distro/angstrom-2008.1.conf b/conf/distro/angstrom-2008.1.conf index 976ac38663..536bb462eb 100644 --- a/conf/distro/angstrom-2008.1.conf +++ b/conf/distro/angstrom-2008.1.conf @@ -94,10 +94,6 @@ PREFERRED_VERSION_busybox = "1.7.2" #avr32 only has patches for binutils 2.17 and gcc 4.1.2 in OE -PREFERRED_VERSION_gcc_avr32 = "4.1.2" -PREFERRED_VERSION_gcc-cross_avr32 = "4.1.2" -PREFERRED_VERSION_gcc-cross-sdk_avr32 = "4.1.2" -PREFERRED_VERSION_gcc-cross-initial_avr32 = "4.1.2" PREFERRED_VERSION_binutils_avr32 = "2.17" PREFERRED_VERSION_binutils-cross_avr32 = "2.17" PREFERRED_VERSION_binutils-cross-sdk_avr32 = "2.17" diff --git a/conf/distro/include/angstrom.inc b/conf/distro/include/angstrom.inc index 8116bcb307..d7ca18e0ca 100644 --- a/conf/distro/include/angstrom.inc +++ b/conf/distro/include/angstrom.inc @@ -47,6 +47,8 @@ TARGET_FPU_arm ?= "soft" TARGET_FPU_armeb ?= "soft" TARGET_FPU_ixp4xx ?= "soft" +TARGET_FPU_dht-walnut ?= "soft" + #Set the right arch for the feeds #Alphabetically sorted -- cgit v1.2.3 From b50d962c7a083cf090d503c76d622a1f3fa743e2 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Thu, 1 Nov 2007 08:55:20 +0000 Subject: atngw100: use linux kernel --- conf/machine/atngw100.conf | 1 + 1 file changed, 1 insertion(+) (limited to 'conf') diff --git a/conf/machine/atngw100.conf b/conf/machine/atngw100.conf index 6acc3d7907..1d402dbef3 100644 --- a/conf/machine/atngw100.conf +++ b/conf/machine/atngw100.conf @@ -10,6 +10,7 @@ PREFERRED_PROVIDER_xserver = "xserver-kdrive" USE_VT = "0" MACHINE_FEATURES = "kernel26 ext2 usbgadget" +PREFERRED_PROVIDER_virtual/kernel = "linux" # used by sysvinit_2 SERIAL_CONSOLE = "115200" -- cgit v1.2.3 From 067d6109b125eb32a38b8bd3cd25af851ba2850b Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Thu, 29 Nov 2007 14:36:22 +0000 Subject: angstrom 2008: prefer gcc 4.2.1 for avr32 --- conf/distro/angstrom-2008.1.conf | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'conf') diff --git a/conf/distro/angstrom-2008.1.conf b/conf/distro/angstrom-2008.1.conf index 70a7f84693..58225bb8ec 100644 --- a/conf/distro/angstrom-2008.1.conf +++ b/conf/distro/angstrom-2008.1.conf @@ -70,13 +70,18 @@ PREFERRED_VERSION_uclibc ?= "0.9.29" PREFERRED_VERSION_uclibc-initial ?= "0.9.29" -#avr32 only has patches for binutils 2.17 and gcc 4.1.2 in OE +#avr32 only has patches for binutils 2.17 and gcc 4.2.1 in OE PREFERRED_VERSION_binutils_avr32 = "2.17" PREFERRED_VERSION_binutils-cross_avr32 = "2.17" PREFERRED_VERSION_binutils-cross-sdk_avr32 = "2.17" #there's is no avr32 patch for 0.9.29 PREFERRED_VERSION_uclibc_avr32 = "0.9.28" PREFERRED_VERSION_uclibc-initial_avr32 = "0.9.28" +PREFERRED_VERSION_gcc_avr32 ?= "4.2.1" +PREFERRED_VERSION_gcc-cross_avr32 ?= "4.2.1" +PREFERRED_VERSION_gcc-cross-sdk_avr32 ?= "4.2.1" +PREFERRED_VERSION_gcc-cross-initial_avr32 ?= "4.2.1" + #Prefer a newer GTK+ and friends PREFERRED_VERSION_gtk+ = "2.12.0" -- cgit v1.2.3 From a621a4ae2f282efbfa6da80a1dbe6a2e8ebc3aff Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Fri, 30 Nov 2007 09:31:11 +0000 Subject: angstrom-uclibc: atler cflags to work around broken avr32 compiler --- conf/distro/include/angstrom-uclibc.inc | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'conf') diff --git a/conf/distro/include/angstrom-uclibc.inc b/conf/distro/include/angstrom-uclibc.inc index 59d40957d5..7e8e60d7dd 100644 --- a/conf/distro/include/angstrom-uclibc.inc +++ b/conf/distro/include/angstrom-uclibc.inc @@ -14,5 +14,10 @@ TARGET_OS = "${@['${TARGET_OS_UC}', 'uclinux-uclibc'][bb.data.getVar('TARGET_ARC #Please see http://free-electrons.com/doc/embedded_linux_optimizations/img47.html for some more info FULL_OPTIMIZATION = "-fexpensive-optimizations -fomit-frame-pointer -frename-registers -Os" BUILD_OPTIMIZATION = "-Os" + +#Gcc will die with 'internal consistency error when using the above optimizations +FULL_OPTIMIZATION_avr32 = "" +BUILD_OPTIMIZATION_avr32 = "" + CXXFLAGS += "-fvisibility-inlines-hidden" -- cgit v1.2.3 From 95580064683ef83263017dce9b610c74306348bb Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Fri, 30 Nov 2007 20:53:17 +0000 Subject: avr32 machines: make uImage hack less fragile --- conf/machine/at32stk1000.conf | 2 +- conf/machine/atngw100.conf | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'conf') diff --git a/conf/machine/at32stk1000.conf b/conf/machine/at32stk1000.conf index 343c6aa44e..ac63af5e56 100644 --- a/conf/machine/at32stk1000.conf +++ b/conf/machine/at32stk1000.conf @@ -23,5 +23,5 @@ EXTRA_IMAGECMD_jffs2 = " --big-endian --pagesize=4096 --eraseblock=65536" KERNEL_IMAGETYPE = "uImage" PREFERRED_VERSION_u-boot = "1.1.4" -ROOTFS_POSTPROCESS_COMMAND += " rm ${IMAGE_ROOTFS}/boot/uImage* ;" +ROOTFS_POSTPROCESS_COMMAND += " rm ${IMAGE_ROOTFS}/boot/uImage* || true;" diff --git a/conf/machine/atngw100.conf b/conf/machine/atngw100.conf index 1d402dbef3..17b4c4187a 100644 --- a/conf/machine/atngw100.conf +++ b/conf/machine/atngw100.conf @@ -22,4 +22,4 @@ EXTRA_IMAGECMD_jffs2 = " --big-endian --pagesize=4096 --eraseblock=65536" PREFERRED_VERSION_u-boot = "1.1.4" KERNEL_IMAGETYPE = "uImage" -ROOTFS_POSTPROCESS_COMMAND += " rm ${IMAGE_ROOTFS}/boot/uImage* ;" +ROOTFS_POSTPROCESS_COMMAND += " rm ${IMAGE_ROOTFS}/boot/uImage* || true ;" -- cgit v1.2.3 From 9030208546561970a18f0eb4be401b4d837aa310 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Tue, 11 Dec 2007 09:46:04 +0000 Subject: angstrom 2008: fix merge damage (I need more coffee) --- conf/distro/angstrom-2008.1.conf | 5 ----- 1 file changed, 5 deletions(-) (limited to 'conf') diff --git a/conf/distro/angstrom-2008.1.conf b/conf/distro/angstrom-2008.1.conf index 5d9f761a95..86c6c998d0 100644 --- a/conf/distro/angstrom-2008.1.conf +++ b/conf/distro/angstrom-2008.1.conf @@ -12,11 +12,6 @@ # http://bugs.openembedded.org # In doubt, use DISTRO="angstrom-2007.1" -#Preferred version for the kernel on various machines -PREFERRED_VERSION_linux-handhelds-2.6 ?= "2.6.21-hh16" - -require conf/distro/angstrom-2007.1.conf - #DISTRO_VERSION = "2008.1" DISTRO_VERSION = "2008.1-test-${DATE}" DISTRO_REVISION = "1" -- cgit v1.2.3