summaryrefslogtreecommitdiffstats
path: root/target
diff options
context:
space:
mode:
authorThiago A. CorrĂȘa <thiago.correa@gmail.com>2009-03-11 21:35:07 +0000
committerThiago A. CorrĂȘa <thiago.correa@gmail.com>2009-03-11 21:35:07 +0000
commit149c0d450cfa890d8ca380fd27582ab2af3fff59 (patch)
treecc550acdd1a63c1459d68a8a33c562aaca5a5fb0 /target
parentfcd24512d85f8e51ad7b4e9e621509842c13a8dc (diff)
downloadbuildroot-novena-149c0d450cfa890d8ca380fd27582ab2af3fff59.tar.gz
buildroot-novena-149c0d450cfa890d8ca380fd27582ab2af3fff59.zip
Let user skip installation of the GUI module for Qtopia
Diffstat (limited to 'target')
-rw-r--r--target/device/Atmel/arch-arm/u-boot/2009.01/u-boot-2009.01-009-factory.patch33
-rw-r--r--target/u-boot/Makefile.in1
2 files changed, 10 insertions, 24 deletions
diff --git a/target/device/Atmel/arch-arm/u-boot/2009.01/u-boot-2009.01-009-factory.patch b/target/device/Atmel/arch-arm/u-boot/2009.01/u-boot-2009.01-009-factory.patch
index 7d1c958dc..adbc03bed 100644
--- a/target/device/Atmel/arch-arm/u-boot/2009.01/u-boot-2009.01-009-factory.patch
+++ b/target/device/Atmel/arch-arm/u-boot/2009.01/u-boot-2009.01-009-factory.patch
@@ -109,8 +109,8 @@ diff -urN u-boot-2009.01-0rig//common/cmd_factory.c u-boot-2009.01/common/cmd_fa
+ setenv("fs-date", MK_STR(DATE));
+ setenv("rd", "rootfs.arm-"MK_STR(DATE)".ext2");
+#endif
-+#if defined(KERNEL_VERSION)
-+ setenv("linux", MK_STR(BOARD_NAME)"-linux-"MK_STR(KERNEL_VERSION)"-"MK_STR(DATE)".gz");
++#if defined(KERNEL_NAME)
++ setenv("linux", MK_STR(KERNEL_NAME));
+#endif
+ setenv("get-ramdisk", "tftp ${ramdisk} ${rd}; setenv rd-size ${filesize}");
+ setenv("store-ramdisk", "cp.b ${ramdisk} ${FS} ${rd-size}");
@@ -243,32 +243,17 @@ diff -urN u-boot-2009.01-0rig//common/cmd_factory.c u-boot-2009.01/common/cmd_fa
+
+int do_os (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
+{
-+ char *kchip;
-+ char *kdate;
-+ char *kver;
-+ char cmd[512];
-+ kchip = getenv("hostname");
-+ kdate = getenv("kernel-date");
-+ kver = getenv("kernel-version");
-+ if((strlen(kdate) + strlen(kver) + 32) > 500) {
-+ printf("Error: Environment too large during 'os': ");
-+ printf("len=%d\n", strlen(kdate) + strlen(kver) + 32);
-+ } else if(kver != NULL) {
-+ if(kdate != NULL) {
-+ sprintf(cmd,"%s-linux-%s-%s.gz",kchip,kver,kdate);
-+ } else {
-+ sprintf(cmd,"%s-linux-%s.gz",kchip,kver);
-+ }
-+ printf("Setting kernel to %s\n",cmd);
-+ setenv("linux",cmd);
-+ return 0;
-+ }
-+ return 1;
++#if defined(KERNEL_NAME)
++ setenv("linux", MK_STR(KERNEL_NAME));
++#else
++ setenv("linux", "uImage");
++#endif
++ return 0;
+}
+
+U_BOOT_CMD(
+ os, 1, 1, do_os,
-+ "os\t- Select linux version ${hostname}-linux-${kernel-name}-${kernel-date}\n"
++ "os\t- Select linux version\n"
+ , "\n"
+);
+
diff --git a/target/u-boot/Makefile.in b/target/u-boot/Makefile.in
index be889a076..53d9dff0c 100644
--- a/target/u-boot/Makefile.in
+++ b/target/u-boot/Makefile.in
@@ -111,6 +111,7 @@ ifdef BR2_TARGET_UBOOT_DEFAULT_ENV
@echo "#ifndef __BR2_ADDED_CONFIG_H" >> $(U_BOOT_INC_CONF_FILE)
@echo "#define __BR2_ADDED_CONFIG_H" >> $(U_BOOT_INC_CONF_FILE)
$(call insert_define, DATE, $(DATE))
+ $(call insert_define, KERNEL_NAME, $(LINUX26_KERNEL_NAME))
$(call insert_define, CONFIG_LOAD_SCRIPTS, 1)
ifneq ($(strip $(BR2_PROJECT)),"")
$(call insert_define, CONFIG_HOSTNAME, $(BR2_PROJECT))