summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarc Kleine-Budde <mkl@pengutronix.de>2007-11-12 14:03:45 +0100
committerMarc Kleine-Budde <mkl@pengutronix.de>2007-11-12 14:03:45 +0100
commitbd8081b620d7d362c79a532288cc2c1a10c39e15 (patch)
tree6fc65588684a8b305aab9cc80af127451f4227a7
parent1d7cb260d8d60d5ff43a1d30d00391f5f01202c7 (diff)
downloadbarebox-bd8081b620d7d362c79a532288cc2c1a10c39e15.tar.gz
barebox-bd8081b620d7d362c79a532288cc2c1a10c39e15.tar.xz
[ipe337] rename environment subdir form defenv -> env
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
-rw-r--r--arch/blackfin/configs/ipe337_defconfig9
-rw-r--r--board/ipe337/env/bin/boot (renamed from board/ipe337/defenv/bin/boot)0
-rw-r--r--board/ipe337/env/bin/init (renamed from board/ipe337/defenv/bin/init)0
-rw-r--r--board/ipe337/env/bin/update_kernel (renamed from board/ipe337/defenv/bin/update_kernel)0
-rw-r--r--board/ipe337/env/bin/update_root (renamed from board/ipe337/defenv/bin/update_root)0
-rw-r--r--board/ipe337/env/config (renamed from board/ipe337/defenv/config)4
6 files changed, 2 insertions, 11 deletions
diff --git a/arch/blackfin/configs/ipe337_defconfig b/arch/blackfin/configs/ipe337_defconfig
index 9b564c76fa..4c273aaf32 100644
--- a/arch/blackfin/configs/ipe337_defconfig
+++ b/arch/blackfin/configs/ipe337_defconfig
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
# U-Boot version: 2.0.0-git
-# Wed Oct 24 10:04:52 2007
+# Thu Oct 4 13:24:51 2007
#
CONFIG_BLACKFIN=y
CONFIG_BF561=y
@@ -34,14 +34,11 @@ CONFIG_TIMESTAMP=y
CONFIG_CONSOLE_ACTIVATE_FIRST=y
# CONFIG_OF_FLAT_TREE is not set
CONFIG_DEFAULT_ENVIRONMENT=y
-CONFIG_DEFAULT_ENVIRONMENT_PATH="board/ipe337/defenv"
+CONFIG_DEFAULT_ENVIRONMENT_PATH="board/ipe337/env"
#
# Debugging
#
-# CONFIG_ENABLE_FLASH_NOISE is not set
-# CONFIG_ENABLE_PARTITION_NOISE is not set
-# CONFIG_ENABLE_DEVICE_NOISE is not set
#
# Commands
@@ -54,7 +51,6 @@ CONFIG_CMD_EDIT=y
CONFIG_CMD_SLEEP=y
CONFIG_CMD_ENVIRONMENT=y
CONFIG_CMD_HELP=y
-# CONFIG_CMD_READLINE is not set
#
# file commands
@@ -132,7 +128,6 @@ CONFIG_DRIVER_NET_SMC911X_ADDRESS_SHIFT=1
CONFIG_DRIVER_CFI=y
# CONFIG_DRIVER_CFI_NEW is not set
CONFIG_CFI_BUFFER_WRITE=y
-# CONFIG_NAND is not set
#
# Filesystem support
diff --git a/board/ipe337/defenv/bin/boot b/board/ipe337/env/bin/boot
index b10ab73d64..b10ab73d64 100644
--- a/board/ipe337/defenv/bin/boot
+++ b/board/ipe337/env/bin/boot
diff --git a/board/ipe337/defenv/bin/init b/board/ipe337/env/bin/init
index 93eef1c9ca..93eef1c9ca 100644
--- a/board/ipe337/defenv/bin/init
+++ b/board/ipe337/env/bin/init
diff --git a/board/ipe337/defenv/bin/update_kernel b/board/ipe337/env/bin/update_kernel
index a9ce158f9c..a9ce158f9c 100644
--- a/board/ipe337/defenv/bin/update_kernel
+++ b/board/ipe337/env/bin/update_kernel
diff --git a/board/ipe337/defenv/bin/update_root b/board/ipe337/env/bin/update_root
index 7d0a21dea1..7d0a21dea1 100644
--- a/board/ipe337/defenv/bin/update_root
+++ b/board/ipe337/env/bin/update_root
diff --git a/board/ipe337/defenv/config b/board/ipe337/env/config
index c7d6368d68..cf0fcb1ad7 100644
--- a/board/ipe337/defenv/config
+++ b/board/ipe337/env/config
@@ -19,7 +19,3 @@ bootargs="console=ttyBF0,115200"
# can be either 'net' or 'flash'
kernel=flash
root=flash
-
-if [ ! -e dev/nor0.0 ]; then
- addpart /dev/nor0 $mtdparts
-fi