[Armadeus-commitlog] armadeus branch, master, updated. armadeus-4.1-419-g3da68ed
Brought to you by:
sszy
Menu
▾
▴
[Armadeus-commitlog] armadeus branch, master, updated. armadeus-4.1-419-g3da68ed
|
From: jorasse <jo...@us...> - 2012-06-25 16:32:10
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".
The branch, master has been updated
via 3da68edb55e2da1289437c5928c3c8d70f6ded8a (commit)
from 70f2d2053678126596e6f72890fc12edde06b824 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 3da68edb55e2da1289437c5928c3c8d70f6ded8a
Author: Eric Jarrige <eri...@ar...>
Date: Mon Jun 25 18:34:23 2012 +0200
[UBOOT] add extrabootargs variable to linux boot usual parameters in order to simplify the kernel boot customization
-----------------------------------------------------------------------
Summary of changes:
.../device/armadeus/apf27/apf27-u-boot-2012.04.h | 8 ++++----
.../device/armadeus/apf28/apf28-u-boot-2012.04.h | 8 ++++----
.../device/armadeus/apf51/apf51-u-boot-2012.04.h | 8 ++++----
.../armadeus/apf9328/apf9328-u-boot-2012.04.h | 8 ++++----
.../device/armadeus/pps/pps-u-boot-2012.04.h | 8 ++++----
5 files changed, 20 insertions(+), 20 deletions(-)
diff --git a/buildroot/target/device/armadeus/apf27/apf27-u-boot-2012.04.h b/buildroot/target/device/armadeus/apf27/apf27-u-boot-2012.04.h
index ae4e989..fe53929 100644
--- a/buildroot/target/device/armadeus/apf27/apf27-u-boot-2012.04.h
+++ b/buildroot/target/device/armadeus/apf27/apf27-u-boot-2012.04.h
@@ -24,7 +24,7 @@
#define __CONFIG_H
#define CONFIG_VERSION_VARIABLE
-#define CONFIG_ENV_VERSION "3.1"
+#define CONFIG_ENV_VERSION "3.2"
#define CONFIG_IDENT_STRING " apf27 patch 3.6"
#define CONFIG_BOARD_NAME apf27
@@ -218,20 +218,20 @@
"ip=${ipaddr}:${serverip}:${gatewayip}:${netmask}:" \
"${hostname}:eth0:off \0" \
"nfsboot=setenv bootargs console=${consoledev},${baudrate} " \
- "${mtdparts}; run addnfsargs addipargs;" \
+ "${mtdparts} ${extrabootargs}; run addnfsargs addipargs;"\
"nfs ${kernel_addr_r} " \
"${serverip}:${rootpath}/boot/${board_name}-linux.bin;" \
"if test -n ${fdt_addr_r} ; then " \
"nand read ${fdt_addr_r} dtb; fi;" \
"bootm ${kernel_addr_r} - ${fdt_addr_r}\0" \
"ubifsboot=setenv bootargs console=${consoledev},${baudrate} " \
- "${mtdparts};run addubifsargs addipargs;" \
+ "${mtdparts} ${extrabootargs};run addubifsargs addipargs;"\
"if test -n ${fdt_addr_r} ; then " \
"nand read ${fdt_addr_r} dtb; fi;" \
"nboot ${kernel_addr_r} kernel;" \
"bootm ${kernel_addr_r} - ${fdt_addr_r}\0" \
"mmcboot=setenv bootargs console=${consoledev},${baudrate} " \
- "${mtdparts}; run addmmcargs addipargs;" \
+ "${mtdparts} ${extrabootargs}; run addmmcargs addipargs;"\
"if test -n ${fdt_addr_r} ; then " \
"nand read ${fdt_addr_r} dtb; fi;" \
"mmc dev 0; ext2load mmc 0 ${kernel_addr_r}" \
diff --git a/buildroot/target/device/armadeus/apf28/apf28-u-boot-2012.04.h b/buildroot/target/device/armadeus/apf28/apf28-u-boot-2012.04.h
index c33f3a5..0154045 100644
--- a/buildroot/target/device/armadeus/apf28/apf28-u-boot-2012.04.h
+++ b/buildroot/target/device/armadeus/apf28/apf28-u-boot-2012.04.h
@@ -25,7 +25,7 @@
#include <asm/arch/regs-base.h>
#define CONFIG_VERSION_VARIABLE
-#define CONFIG_ENV_VERSION "1.1"
+#define CONFIG_ENV_VERSION "1.2"
#define CONFIG_IDENT_STRING " apf28 patch 1.5"
#define CONFIG_BOARD_NAME apf28
@@ -247,20 +247,20 @@
"ip=${ipaddr}:${serverip}:${gatewayip}:${netmask}:" \
"${hostname}:eth0:off\0" \
"nfsboot=setenv bootargs console=${consoledev},${baudrate} " \
- "${mtdparts}; run addnfsargs addipargs;" \
+ "${mtdparts} ${extrabootargs}; run addnfsargs addipargs;"\
"nfs ${kernel_addr_r} " \
"${serverip}:${rootpath}/boot/${board_name}-linux.bin;" \
"if test -n ${fdt_addr_r} ; then " \
"nand read ${fdt_addr_r} dtb; fi;" \
"bootm ${kernel_addr_r} - ${fdt_addr_r}\0" \
"ubifsboot=setenv bootargs console=${consoledev},${baudrate} " \
- "${mtdparts};run addubifsargs addipargs;" \
+ "${mtdparts} ${extrabootargs};run addubifsargs addipargs;"\
"if test -n ${fdt_addr_r} ; then " \
"nand read ${fdt_addr_r} dtb; fi;" \
"nboot ${kernel_addr_r} kernel;" \
"bootm ${kernel_addr_r} - ${fdt_addr_r}\0" \
"mmcboot=setenv bootargs console=${consoledev},${baudrate} " \
- "${mtdparts}; run addmmcargs addipargs;" \
+ "${mtdparts} ${extrabootargs}; run addmmcargs addipargs;"\
"if test -n ${fdt_addr_r} ; then " \
"nand read ${fdt_addr_r} dtb; fi;" \
"mmc dev 0; ext2load mmc 0 ${kernel_addr_r}" \
diff --git a/buildroot/target/device/armadeus/apf51/apf51-u-boot-2012.04.h b/buildroot/target/device/armadeus/apf51/apf51-u-boot-2012.04.h
index ec6515b..6b9d2ed 100644
--- a/buildroot/target/device/armadeus/apf51/apf51-u-boot-2012.04.h
+++ b/buildroot/target/device/armadeus/apf51/apf51-u-boot-2012.04.h
@@ -24,7 +24,7 @@
#define __CONFIG_H
#define CONFIG_VERSION_VARIABLE
-#define CONFIG_ENV_VERSION "1.1"
+#define CONFIG_ENV_VERSION "1.2"
#define CONFIG_IDENT_STRING " apf51 patch 1.5"
#define CONFIG_BOARD_NAME apf51
@@ -226,20 +226,20 @@
"ip=${ipaddr}:${serverip}:${gatewayip}:${netmask}:" \
"${hostname}:eth0:off\0" \
"nfsboot=setenv bootargs console=${consoledev},${baudrate} " \
- "${mtdparts}; run addnfsargs addipargs;" \
+ "${mtdparts} ${extrabootargs}; run addnfsargs addipargs;"\
"nfs ${kernel_addr_r} " \
"${serverip}:${rootpath}/boot/${board_name}-linux.bin;" \
"if test -n ${fdt_addr_r} ; then " \
"nand read ${fdt_addr_r} dtb; fi;" \
"bootm ${kernel_addr_r} - ${fdt_addr_r}\0" \
"ubifsboot=setenv bootargs console=${consoledev},${baudrate} " \
- "${mtdparts};run addubifsargs addipargs;" \
+ "${mtdparts} ${extrabootargs};run addubifsargs addipargs;"\
"if test -n ${fdt_addr_r} ; then " \
"nand read ${fdt_addr_r} dtb; fi;" \
"nboot ${kernel_addr_r} kernel;" \
"bootm ${kernel_addr_r} - ${fdt_addr_r}\0" \
"mmcboot=setenv bootargs console=${consoledev},${baudrate} " \
- "${mtdparts}; run addmmcargs addipargs; setenv autostart yes;" \
+ "${mtdparts} ${extrabootargs}; run addmmcargs addipargs;"\
"if test -n ${fdt_addr_r} ; then " \
"nand read ${fdt_addr_r} dtb; fi;" \
"nboot ${kernel_addr_r} kernel;" \
diff --git a/buildroot/target/device/armadeus/apf9328/apf9328-u-boot-2012.04.h b/buildroot/target/device/armadeus/apf9328/apf9328-u-boot-2012.04.h
index ff052a1..afeb415 100644
--- a/buildroot/target/device/armadeus/apf9328/apf9328-u-boot-2012.04.h
+++ b/buildroot/target/device/armadeus/apf9328/apf9328-u-boot-2012.04.h
@@ -23,7 +23,7 @@
#define __CONFIG_H
#define CONFIG_VERSION_VARIABLE
-#define CONFIG_ENV_VERSION "5.2"
+#define CONFIG_ENV_VERSION "5.3"
#define CONFIG_IDENT_STRING " apf9328 patch 5.5"
#define CONFIG_BOARD_NAME apf9328
@@ -206,15 +206,15 @@
"ip=${ipaddr}:${serverip}:${gatewayip}:${netmask}:" \
"${hostname}:eth0:off \0" \
"nfsboot=setenv bootargs console=${consoledev},${baudrate} " \
- "${mtdparts}; run addnfsargs addipargs; " \
+ "${mtdparts} ${extrabootargs}; run addnfsargs addipargs; "\
"nfs ${loadaddr} " \
"${serverip}:${rootpath}/boot/${board_name}-linux.bin;" \
"bootm ${loadaddr}\0" \
"jffsboot=setenv bootargs console=${consoledev},${baudrate} " \
- "${mtdparts}; run addjffsargs addipargs; " \
+ "${mtdparts} ${extrabootargs}; run addjffsargs addipargs; "\
"bootm ${kernel_addr}\0" \
"mmcboot=setenv bootargs console=${consoledev},${baudrate} " \
- "${mtdparts}; run addmmcargs addipargs; " \
+ "${mtdparts} ${extrabootargs}; run addmmcargs addipargs; "\
"bootm ${kernel_addr}\0" \
"flash_uboot=protect off nor0,0;" \
"echo Erasing FLASH;" \
diff --git a/buildroot/target/device/armadeus/pps/pps-u-boot-2012.04.h b/buildroot/target/device/armadeus/pps/pps-u-boot-2012.04.h
index 1f0b366..d399c3a 100644
--- a/buildroot/target/device/armadeus/pps/pps-u-boot-2012.04.h
+++ b/buildroot/target/device/armadeus/pps/pps-u-boot-2012.04.h
@@ -24,7 +24,7 @@
#define __CONFIG_H
#define CONFIG_VERSION_VARIABLE
-#define CONFIG_ENV_VERSION "3.1"
+#define CONFIG_ENV_VERSION "3.2"
#define CONFIG_IDENT_STRING " pps patch 3.5"
#define CONFIG_BOARD_NAME pps
@@ -218,20 +218,20 @@
"ip=${ipaddr}:${serverip}:${gatewayip}:${netmask}:" \
"${hostname}:eth0:off \0" \
"nfsboot=setenv bootargs console=${consoledev},${baudrate} " \
- "${mtdparts}; run addnfsargs addipargs;" \
+ "${mtdparts} ${extrabootargs}; run addnfsargs addipargs;"\
"nfs ${kernel_addr_r} " \
"${serverip}:${rootpath}/boot/${board_name}-linux.bin;" \
"if test -n ${fdt_addr_r} ; then " \
"nand read ${fdt_addr_r} dtb; fi;" \
"bootm ${kernel_addr_r} - ${fdt_addr_r}\0" \
"ubifsboot=setenv bootargs console=${consoledev},${baudrate} " \
- "${mtdparts};run addubifsargs addipargs;" \
+ "${mtdparts} ${extrabootargs};run addubifsargs addipargs;"\
"if test -n ${fdt_addr_r} ; then " \
"nand read ${fdt_addr_r} dtb; fi;" \
"nboot ${kernel_addr_r} kernel;" \
"bootm ${kernel_addr_r} - ${fdt_addr_r}\0" \
"mmcboot=setenv bootargs console=${consoledev},${baudrate} " \
- "${mtdparts}; run addmmcargs addipargs;" \
+ "${mtdparts} ${extrabootargs}; run addmmcargs addipargs;"\
"if test -n ${fdt_addr_r} ; then " \
"nand read ${fdt_addr_r} dtb; fi;" \
"mmc dev 0; ext2load mmc 0 ${kernel_addr_r}" \
hooks/post-receive
--
armadeus
|
