* [PATCH 1/2] sandbox: update defconfig to use new environment
@ 2014-02-02 20:32 Michael Grzeschik
2014-02-02 20:32 ` [PATCH 2/2] sandbox: update to " Michael Grzeschik
2014-02-03 8:35 ` [PATCH 1/2] sandbox: update defconfig to use " Sascha Hauer
0 siblings, 2 replies; 3+ messages in thread
From: Michael Grzeschik @ 2014-02-02 20:32 UTC (permalink / raw)
To: barebox
Signed-off-by: Michael Grzeschik <m.grzeschik@pengutronix.de>
---
arch/sandbox/configs/sandbox_defconfig | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/arch/sandbox/configs/sandbox_defconfig b/arch/sandbox/configs/sandbox_defconfig
index 2ee7f782ede8..2ef8fa41ec51 100644
--- a/arch/sandbox/configs/sandbox_defconfig
+++ b/arch/sandbox/configs/sandbox_defconfig
@@ -1,18 +1,20 @@
-CONFIG_GLOB=y
+CONFIG_HUSH_FANCY_PROMPT=y
CONFIG_CMDLINE_EDITING=y
CONFIG_AUTO_COMPLETE=y
CONFIG_PARTITION=y
+CONFIG_DEFAULT_ENVIRONMENT_GENERIC_NEW=y
CONFIG_DEFAULT_ENVIRONMENT_PATH="arch/sandbox/board/env"
CONFIG_DEBUG_INFO=y
CONFIG_CMD_EDIT=y
CONFIG_CMD_SLEEP=y
CONFIG_CMD_SAVEENV=y
-CONFIG_CMD_LOADENV=y
CONFIG_CMD_EXPORT=y
CONFIG_CMD_PRINTENV=y
CONFIG_CMD_READLINE=y
+CONFIG_CMD_TFTP=y
CONFIG_CMD_MEMINFO=y
CONFIG_CMD_CRC=y
+CONFIG_CMD_FLASH=y
# CONFIG_CMD_BOOTM is not set
CONFIG_CMD_RESET=y
CONFIG_CMD_GO=y
@@ -21,8 +23,7 @@ CONFIG_CMD_PARTITION=y
CONFIG_NET=y
CONFIG_NET_DHCP=y
CONFIG_NET_PING=y
-CONFIG_CMD_TFTP=y
-CONFIG_FS_TFTP=y
CONFIG_DRIVER_NET_TAP=y
# CONFIG_SPI is not set
CONFIG_FS_CRAMFS=y
+CONFIG_FS_TFTP=y
--
1.8.5.3
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
^ permalink raw reply [flat|nested] 3+ messages in thread
* [PATCH 2/2] sandbox: update to new environment
2014-02-02 20:32 [PATCH 1/2] sandbox: update defconfig to use new environment Michael Grzeschik
@ 2014-02-02 20:32 ` Michael Grzeschik
2014-02-03 8:35 ` [PATCH 1/2] sandbox: update defconfig to use " Sascha Hauer
1 sibling, 0 replies; 3+ messages in thread
From: Michael Grzeschik @ 2014-02-02 20:32 UTC (permalink / raw)
To: barebox
Signed-off-by: Michael Grzeschik <m.grzeschik@pengutronix.de>
---
arch/sandbox/board/env/bin/init | 7 -------
arch/sandbox/board/env/config | 8 --------
arch/sandbox/board/env/network/eth0 | 11 +++++++++++
3 files changed, 11 insertions(+), 15 deletions(-)
delete mode 100644 arch/sandbox/board/env/bin/init
delete mode 100644 arch/sandbox/board/env/config
create mode 100644 arch/sandbox/board/env/network/eth0
diff --git a/arch/sandbox/board/env/bin/init b/arch/sandbox/board/env/bin/init
deleted file mode 100644
index a7cb7d563d9a..000000000000
--- a/arch/sandbox/board/env/bin/init
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/sh
-
-PATH=/env/bin
-export PATH
-
-. /env/config
-
diff --git a/arch/sandbox/board/env/config b/arch/sandbox/board/env/config
deleted file mode 100644
index 2b148b6daa6b..000000000000
--- a/arch/sandbox/board/env/config
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/sh
-
-eth0.ipaddr=172.0.0.2
-eth0.netmask=255.255.255.0
-eth0.gateway=172.0.0.1
-eth0.serverip=172.0.0.1
-eth0.ethaddr=80:81:82:83:84:85
-
diff --git a/arch/sandbox/board/env/network/eth0 b/arch/sandbox/board/env/network/eth0
new file mode 100644
index 000000000000..17e0c185f593
--- /dev/null
+++ b/arch/sandbox/board/env/network/eth0
@@ -0,0 +1,11 @@
+#!/bin/sh
+
+# ip setting (static/dhcp)
+ip=static
+
+# static setup used if ip=static
+ipaddr=172.0.0.2
+netmask=255.255.255.0
+gateway=172.0.0.1
+serverip=172.0.0.1
+ethaddr=80:81:82:83:84:85
--
1.8.5.3
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH 1/2] sandbox: update defconfig to use new environment
2014-02-02 20:32 [PATCH 1/2] sandbox: update defconfig to use new environment Michael Grzeschik
2014-02-02 20:32 ` [PATCH 2/2] sandbox: update to " Michael Grzeschik
@ 2014-02-03 8:35 ` Sascha Hauer
1 sibling, 0 replies; 3+ messages in thread
From: Sascha Hauer @ 2014-02-03 8:35 UTC (permalink / raw)
To: Michael Grzeschik; +Cc: barebox
On Sun, Feb 02, 2014 at 09:32:48PM +0100, Michael Grzeschik wrote:
> Signed-off-by: Michael Grzeschik <m.grzeschik@pengutronix.de>
Applied, thanks
Sascha
> ---
> arch/sandbox/configs/sandbox_defconfig | 9 +++++----
> 1 file changed, 5 insertions(+), 4 deletions(-)
>
> diff --git a/arch/sandbox/configs/sandbox_defconfig b/arch/sandbox/configs/sandbox_defconfig
> index 2ee7f782ede8..2ef8fa41ec51 100644
> --- a/arch/sandbox/configs/sandbox_defconfig
> +++ b/arch/sandbox/configs/sandbox_defconfig
> @@ -1,18 +1,20 @@
> -CONFIG_GLOB=y
> +CONFIG_HUSH_FANCY_PROMPT=y
> CONFIG_CMDLINE_EDITING=y
> CONFIG_AUTO_COMPLETE=y
> CONFIG_PARTITION=y
> +CONFIG_DEFAULT_ENVIRONMENT_GENERIC_NEW=y
> CONFIG_DEFAULT_ENVIRONMENT_PATH="arch/sandbox/board/env"
> CONFIG_DEBUG_INFO=y
> CONFIG_CMD_EDIT=y
> CONFIG_CMD_SLEEP=y
> CONFIG_CMD_SAVEENV=y
> -CONFIG_CMD_LOADENV=y
> CONFIG_CMD_EXPORT=y
> CONFIG_CMD_PRINTENV=y
> CONFIG_CMD_READLINE=y
> +CONFIG_CMD_TFTP=y
> CONFIG_CMD_MEMINFO=y
> CONFIG_CMD_CRC=y
> +CONFIG_CMD_FLASH=y
> # CONFIG_CMD_BOOTM is not set
> CONFIG_CMD_RESET=y
> CONFIG_CMD_GO=y
> @@ -21,8 +23,7 @@ CONFIG_CMD_PARTITION=y
> CONFIG_NET=y
> CONFIG_NET_DHCP=y
> CONFIG_NET_PING=y
> -CONFIG_CMD_TFTP=y
> -CONFIG_FS_TFTP=y
> CONFIG_DRIVER_NET_TAP=y
> # CONFIG_SPI is not set
> CONFIG_FS_CRAMFS=y
> +CONFIG_FS_TFTP=y
> --
> 1.8.5.3
>
>
> _______________________________________________
> barebox mailing list
> barebox@lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/barebox
>
--
Pengutronix e.K. | |
Industrial Linux Solutions | http://www.pengutronix.de/ |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2014-02-03 8:36 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2014-02-02 20:32 [PATCH 1/2] sandbox: update defconfig to use new environment Michael Grzeschik
2014-02-02 20:32 ` [PATCH 2/2] sandbox: update to " Michael Grzeschik
2014-02-03 8:35 ` [PATCH 1/2] sandbox: update defconfig to use " Sascha Hauer
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox