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/ccxmx51 | |
| 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/ccxmx51')
| -rw-r--r-- | arch/arm/boards/ccxmx51/env/config-board | 10 | ||||
| -rw-r--r-- | arch/arm/boards/ccxmx51/env/nv/autoboot_timeout | 1 | ||||
| -rw-r--r-- | arch/arm/boards/ccxmx51/env/nv/boot.default | 1 | ||||
| -rw-r--r-- | arch/arm/boards/ccxmx51/env/nv/linux.bootargs.base | 1 |
4 files changed, 3 insertions, 10 deletions
diff --git a/arch/arm/boards/ccxmx51/env/config-board b/arch/arm/boards/ccxmx51/env/config-board deleted file mode 100644 index 1405344903..0000000000 --- a/arch/arm/boards/ccxmx51/env/config-board +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/sh - -# Timeout in seconds before the default boot entry is started -global.autoboot_timeout=2 - -# Default boot entry (one of /env/boot/*) -global.boot.default=nand - -# Board bootargs -global.linux.bootargs.base="earlyprintk console=ttymxc0,115200n8" diff --git a/arch/arm/boards/ccxmx51/env/nv/autoboot_timeout b/arch/arm/boards/ccxmx51/env/nv/autoboot_timeout new file mode 100644 index 0000000000..0cfbf08886 --- /dev/null +++ b/arch/arm/boards/ccxmx51/env/nv/autoboot_timeout @@ -0,0 +1 @@ +2 diff --git a/arch/arm/boards/ccxmx51/env/nv/boot.default b/arch/arm/boards/ccxmx51/env/nv/boot.default new file mode 100644 index 0000000000..026a25cc7e --- /dev/null +++ b/arch/arm/boards/ccxmx51/env/nv/boot.default @@ -0,0 +1 @@ +nand diff --git a/arch/arm/boards/ccxmx51/env/nv/linux.bootargs.base b/arch/arm/boards/ccxmx51/env/nv/linux.bootargs.base new file mode 100644 index 0000000000..d83eb9414a --- /dev/null +++ b/arch/arm/boards/ccxmx51/env/nv/linux.bootargs.base @@ -0,0 +1 @@ +earlyprintk console=ttymxc0,115200n8 |