diff options
author | Alexander Shiyan <shc_work@mail.ru> | 2013-02-13 15:41:43 +0400 |
---|---|---|
committer | Sascha Hauer <s.hauer@pengutronix.de> | 2013-02-13 18:34:26 +0100 |
commit | 1009b307bdc4cf7731d835f5b01f01e1e0c22780 (patch) | |
tree | 1c33503569ee6c5af866b3d241c8b821d2ad9ff6 /arch/arm/boards/clep7212 | |
parent | 3539bb8017c0973b7faf3a20c9bc67b5b67baa2c (diff) | |
download | barebox-1009b307bdc4cf7731d835f5b01f01e1e0c22780.tar.gz barebox-1009b307bdc4cf7731d835f5b01f01e1e0c22780.tar.xz |
ARM: clep7212: Update default environment
Signed-off-by: Alexander Shiyan <shc_work@mail.ru>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'arch/arm/boards/clep7212')
-rw-r--r-- | arch/arm/boards/clep7212/env/bin/mtdparts-add | 21 | ||||
-rw-r--r-- | arch/arm/boards/clep7212/env/boot/nor | 2 | ||||
-rw-r--r-- | arch/arm/boards/clep7212/env/config | 20 | ||||
-rw-r--r-- | arch/arm/boards/clep7212/env/init/automount | 6 | ||||
-rw-r--r-- | arch/arm/boards/clep7212/env/init/bootargs-base | 8 | ||||
-rw-r--r-- | arch/arm/boards/clep7212/env/init/general | 12 | ||||
-rw-r--r-- | arch/arm/boards/clep7212/env/init/hostname | 8 | ||||
-rw-r--r-- | arch/arm/boards/clep7212/env/init/mtdparts-nor | 11 |
8 files changed, 32 insertions, 56 deletions
diff --git a/arch/arm/boards/clep7212/env/bin/mtdparts-add b/arch/arm/boards/clep7212/env/bin/mtdparts-add deleted file mode 100644 index ef1bc0215f..0000000000 --- a/arch/arm/boards/clep7212/env/bin/mtdparts-add +++ /dev/null @@ -1,21 +0,0 @@ -#!/bin/sh - -if [ "$1" = menu ]; then - init-menu-add-entry "$0" "Partitions" - exit -fi - -norparts="256k(barebox),256k(bareboxenv),3584k(kernel),-(root)" -ramparts="-(ramdisk)" - -if [ -e /dev/nor0 ]; then - addpart -n /dev/nor0 "${norparts}" - - global linux.mtdparts.nor - global.linux.mtdparts.nor="physmap-flash.0:${norparts}" -else - echo "NOR Flash not found." -fi - -global linux.mtdparts.ram -global.linux.mtdparts.ram="mtd-ram.0:${ramparts}" diff --git a/arch/arm/boards/clep7212/env/boot/nor b/arch/arm/boards/clep7212/env/boot/nor index 5cf1e15833..df8c983884 100644 --- a/arch/arm/boards/clep7212/env/boot/nor +++ b/arch/arm/boards/clep7212/env/boot/nor @@ -6,4 +6,4 @@ if [ "$1" = menu ]; then fi global.bootm.image="/dev/kernel" -global.linux.bootargs.dyn.root="root=/dev/mtdblock4 ro" +global.linux.bootargs.dyn.root="root=/dev/mtdblock3 ro" diff --git a/arch/arm/boards/clep7212/env/config b/arch/arm/boards/clep7212/env/config new file mode 100644 index 0000000000..e8f2c3ab1b --- /dev/null +++ b/arch/arm/boards/clep7212/env/config @@ -0,0 +1,20 @@ +#!/bin/sh + +global.hostname=clps711x + +# set to false if you do not want to have colors +global.allow_color=true + +# user (used for network filenames) +global.user=anonymous + +# timeout in seconds before the default boot entry is started +global.autoboot_timeout=2 + +# default boot entry (one of /env/boot/*) +if [ -e /dev/nor0 ]; then + global.boot.default=nor +fi + +# default bootargs +global.linux.bootargs.base="earlyprintk console=ttyCL0,57600n8" diff --git a/arch/arm/boards/clep7212/env/init/automount b/arch/arm/boards/clep7212/env/init/automount deleted file mode 100644 index 978b96450d..0000000000 --- a/arch/arm/boards/clep7212/env/init/automount +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/sh - -if [ "$1" = menu ]; then - init-menu-add-entry "$0" "Automountpoints" - exit -fi diff --git a/arch/arm/boards/clep7212/env/init/bootargs-base b/arch/arm/boards/clep7212/env/init/bootargs-base deleted file mode 100644 index ec08e39181..0000000000 --- a/arch/arm/boards/clep7212/env/init/bootargs-base +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/sh - -if [ "$1" = menu ]; then - init-menu-add-entry "$0" "Base bootargs" - exit -fi - -global.linux.bootargs.base="earlyprintk console=ttyCL0,57600n8" diff --git a/arch/arm/boards/clep7212/env/init/general b/arch/arm/boards/clep7212/env/init/general deleted file mode 100644 index 77e6a59e6b..0000000000 --- a/arch/arm/boards/clep7212/env/init/general +++ /dev/null @@ -1,12 +0,0 @@ -#!/bin/sh - -if [ "$1" = menu ]; then - init-menu-add-entry "$0" "general config settings" - exit -fi - -global.user=barebox -global.autoboot_timeout=2 -global.boot.default=nor - -/env/bin/mtdparts-add diff --git a/arch/arm/boards/clep7212/env/init/hostname b/arch/arm/boards/clep7212/env/init/hostname deleted file mode 100644 index 684ee63ba5..0000000000 --- a/arch/arm/boards/clep7212/env/init/hostname +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/sh - -if [ "$1" = menu ]; then - init-menu-add-entry "$0" "hostname" - exit -fi - -global.hostname=clep7212 diff --git a/arch/arm/boards/clep7212/env/init/mtdparts-nor b/arch/arm/boards/clep7212/env/init/mtdparts-nor new file mode 100644 index 0000000000..7910299c8a --- /dev/null +++ b/arch/arm/boards/clep7212/env/init/mtdparts-nor @@ -0,0 +1,11 @@ +#!/bin/sh + +if [ "$1" = menu ]; then + init-menu-add-entry "$0" "NOR partitions" + exit +fi + +mtdparts="256k(barebox),256k(bareboxenv),3584k(kernel),-(root)" +kernelname="physmap-flash.0" + +mtdparts-add -d nor0 -k ${kernelname} -p ${mtdparts} |