jeans/motioneyeos
jeans/motioneyeos
1
0
Fork 0
mirror of https://github.com/motioneye-project/motioneyeos.git synced 2025-08-02 16:07:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert wrongly commited files (u-boot changes) from -r25617

Browse Source
This commit is contained in:
Thiago A. Corrêa 2009-03-11 21:40:00 +00:00
parent 149c0d450c
commit 227d6e5245
2 changed files with 24 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
target/device/Atmel/arch-arm/u-boot/2009.01/u-boot-2009.01-009-factory.patch
View File

@ -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("fs-date", MK_STR(DATE));
+ setenv("rd", "rootfs.arm-"MK_STR(DATE)".ext2"); + setenv("rd", "rootfs.arm-"MK_STR(DATE)".ext2");
+#endif +#endif
+#if defined(KERNEL_NAME) +#if defined(KERNEL_VERSION)
+ setenv("linux", MK_STR(KERNEL_NAME)); + setenv("linux", MK_STR(BOARD_NAME)"-linux-"MK_STR(KERNEL_VERSION)"-"MK_STR(DATE)".gz");
+#endif +#endif
+ setenv("get-ramdisk", "tftp ${ramdisk} ${rd}; setenv rd-size ${filesize}"); + setenv("get-ramdisk", "tftp ${ramdisk} ${rd}; setenv rd-size ${filesize}");
+ setenv("store-ramdisk", "cp.b ${ramdisk} ${FS} ${rd-size}"); + setenv("store-ramdisk", "cp.b ${ramdisk} ${FS} ${rd-size}");
@ -243,17 +243,32 @@ 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[]) +int do_os (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
+{ +{
+#if defined(KERNEL_NAME) + char *kchip;
+ setenv("linux", MK_STR(KERNEL_NAME)); + char *kdate;
+#else + char *kver;
+ setenv("linux", "uImage"); + char cmd[512];
+#endif + 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 0;
+ } + }
+ return 1;
+}
+ +
+U_BOOT_CMD( +U_BOOT_CMD(
+ os, 1, 1, do_os, + os, 1, 1, do_os,
+ "os\t- Select linux version\n" + "os\t- Select linux version ${hostname}-linux-${kernel-name}-${kernel-date}\n"
+ , "\n" + , "\n"
+); +);
+ +

1
target/u-boot/Makefile.in
View File

@ -111,7 +111,6 @@ ifdef BR2_TARGET_UBOOT_DEFAULT_ENV
@echo "#ifndef __BR2_ADDED_CONFIG_H" >> $(U_BOOT_INC_CONF_FILE) @echo "#ifndef __BR2_ADDED_CONFIG_H" >> $(U_BOOT_INC_CONF_FILE)
@echo "#define __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, DATE, $(DATE))
$(call insert_define, KERNEL_NAME, $(LINUX26_KERNEL_NAME))
$(call insert_define, CONFIG_LOAD_SCRIPTS, 1) $(call insert_define, CONFIG_LOAD_SCRIPTS, 1)
ifneq ($(strip $(BR2_PROJECT)),"") ifneq ($(strip $(BR2_PROJECT)),"")
$(call insert_define, CONFIG_HOSTNAME, $(BR2_PROJECT)) $(call insert_define, CONFIG_HOSTNAME, $(BR2_PROJECT))