diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2014-12-08 14:54:09 +0100 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2014-12-08 14:54:09 +0100 |
| commit | 3eade89c7573f8893fe045290e374d4502092e13 (patch) | |
| tree | defd4218ff82053d44f54595af4e882ea7eb988a /arch/arm/boards/efika-mx-smartbook | |
| parent | c2b5a7015b7323af4b7c8cf19a06b954f4f09949 (diff) | |
| parent | 7962e7a0b423a5dfba251622f64d3891f69a55c0 (diff) | |
| download | barebox-3eade89c7573f8893fe045290e374d4502092e13.tar.gz barebox-3eade89c7573f8893fe045290e374d4502092e13.tar.xz | |
Merge branch 'for-next/persistent-vars'
Conflicts:
arch/arm/boards/efika-mx-smartbook/defaultenv-efikasb/config
Diffstat (limited to 'arch/arm/boards/efika-mx-smartbook')
6 files changed, 8 insertions, 29 deletions
diff --git a/arch/arm/boards/efika-mx-smartbook/defaultenv-efikasb/config b/arch/arm/boards/efika-mx-smartbook/defaultenv-efikasb/config deleted file mode 100644 index c63c6a1fa5..0000000000 --- a/arch/arm/boards/efika-mx-smartbook/defaultenv-efikasb/config +++ /dev/null @@ -1,29 +0,0 @@ -#!/bin/sh - -# change network settings in /env/network/eth0 -# change mtd partition settings and automountpoints in /env/init/* - -#global.hostname= - -# set to false if you do not want to have colors -global.allow_color=true - -# user (used for network filenames) -global.user=none - -# timeout in seconds before the default boot entry is started -global.autoboot_timeout=1 - -# default boot entry (one of /env/boot/*) -# (if not overwritten here, the bootdevice barebox comes from -# is used) -#global.boot.default=net - -# base bootargs -global.linux.bootargs.base="console=tty1" - -# suitable for 800MHz -global linux.bootargs.lpj="lpj=3997696" - -# speed up booting by being more quiet -global linux.bootargs.quiet="quiet" diff --git a/arch/arm/boards/efika-mx-smartbook/defaultenv-efikasb/init/bootsource b/arch/arm/boards/efika-mx-smartbook/defaultenv-efikasb/init/bootsource index 380e85589b..eb98a3c5b6 100644 --- a/arch/arm/boards/efika-mx-smartbook/defaultenv-efikasb/init/bootsource +++ b/arch/arm/boards/efika-mx-smartbook/defaultenv-efikasb/init/bootsource @@ -1,5 +1,9 @@ #!/bin/sh +if [ -n "$nv.boot.default" ]; then + exit +fi + # by default pick kernel from MMC card if booting from # it, otherwise default to boot from internal harddisk diff --git a/arch/arm/boards/efika-mx-smartbook/env/nv/autoboot_timeout b/arch/arm/boards/efika-mx-smartbook/env/nv/autoboot_timeout new file mode 100644 index 0000000000..d00491fd7e --- /dev/null +++ b/arch/arm/boards/efika-mx-smartbook/env/nv/autoboot_timeout @@ -0,0 +1 @@ +1 diff --git a/arch/arm/boards/efika-mx-smartbook/env/nv/linux.bootargs.base b/arch/arm/boards/efika-mx-smartbook/env/nv/linux.bootargs.base new file mode 100644 index 0000000000..04415e6303 --- /dev/null +++ b/arch/arm/boards/efika-mx-smartbook/env/nv/linux.bootargs.base @@ -0,0 +1 @@ +console=tty1 diff --git a/arch/arm/boards/efika-mx-smartbook/env/nv/linux.bootargs.lpj b/arch/arm/boards/efika-mx-smartbook/env/nv/linux.bootargs.lpj new file mode 100644 index 0000000000..e5c753e10e --- /dev/null +++ b/arch/arm/boards/efika-mx-smartbook/env/nv/linux.bootargs.lpj @@ -0,0 +1 @@ +lpj=3997696 diff --git a/arch/arm/boards/efika-mx-smartbook/env/nv/linux.bootargs.quiet b/arch/arm/boards/efika-mx-smartbook/env/nv/linux.bootargs.quiet new file mode 100644 index 0000000000..2448b2c384 --- /dev/null +++ b/arch/arm/boards/efika-mx-smartbook/env/nv/linux.bootargs.quiet @@ -0,0 +1 @@ +quiet |