diff options
author | Juergen Beisert <jbe@pengutronix.de> | 2007-11-08 18:23:44 +0100 |
---|---|---|
committer | Juergen Beisert <jbe@pengutronix.de> | 2007-11-08 18:23:44 +0100 |
commit | a7d96488e5f56a2f77b2dfbc3efc01f8b76db920 (patch) | |
tree | 1ad19de2d1a8e42e83b0276a20669312f695099f | |
parent | e5eba4cf3a9622c53fe3ce8a2b2f6c804088f6eb (diff) | |
download | barebox-a7d96488e5f56a2f77b2dfbc3efc01f8b76db920.tar.gz barebox-a7d96488e5f56a2f77b2dfbc3efc01f8b76db920.tar.xz |
Using correct board names all over the place
Signed-off-by: Juergen Beisert <jbe@pengutronix.de>
-rw-r--r-- | Documentation/boards.dox | 8 | ||||
-rw-r--r-- | TODO | 7 | ||||
-rw-r--r-- | arch/arm/Kconfig | 16 | ||||
-rw-r--r-- | arch/arm/Makefile | 4 | ||||
-rw-r--r-- | arch/arm/configs/pcm037_defconfig (renamed from arch/arm/configs/phycore_imx31_defconfig) | 6 | ||||
-rw-r--r-- | arch/arm/configs/pcm038_defconfig (renamed from arch/arm/configs/phyCORE-pcm038_defconfig) | 4 | ||||
-rw-r--r-- | arch/arm/configs/scb9328_defconfig | 2 | ||||
-rw-r--r-- | arch/ppc/Makefile | 2 | ||||
-rw-r--r-- | arch/ppc/configs/pcm030_defconfig (renamed from arch/ppc/configs/phycore_mpc5200b_tiny_defconfig) | 0 | ||||
-rw-r--r-- | board/pcm030/Makefile | 2 | ||||
-rw-r--r-- | board/pcm030/mt46v32m16-75.h (renamed from board/phycore_mpc5200b_tiny/mt46v32m16-75.h) | 0 | ||||
-rw-r--r-- | board/pcm030/pcm030.c (renamed from board/phycore_mpc5200b_tiny/phycore_mpc5200b_tiny.c) | 0 | ||||
-rw-r--r-- | board/pcm030/pcm030.dox (renamed from board/phycore_mpc5200b_tiny/phycore_mpc5200b_tiny.dox) | 2 | ||||
-rw-r--r-- | board/pcm030/u-boot.lds.S (renamed from board/phycore_mpc5200b_tiny/u-boot.lds.S) | 0 | ||||
-rw-r--r-- | board/pcm037/Makefile (renamed from board/phycore_imx31/Makefile) | 2 | ||||
-rw-r--r-- | board/pcm037/env/bin/init (renamed from board/phycore_imx31/env/bin/init) | 0 | ||||
-rw-r--r-- | board/pcm037/lowlevel_init.S (renamed from board/phycore_imx31/lowlevel_init.S) | 0 | ||||
-rw-r--r-- | board/pcm037/pcm037.c (renamed from board/phycore_imx31/phycore_imx31.c) | 0 | ||||
-rw-r--r-- | board/pcm037/pcm037.dox (renamed from board/phycore_imx31/phycore_imx31.dox) | 2 | ||||
-rw-r--r-- | board/pcm038/Makefile (renamed from board/phycore_pcm038/Makefile) | 0 | ||||
-rw-r--r-- | board/pcm038/lowlevel_init.S (renamed from board/phycore_pcm038/lowlevel_init.S) | 0 | ||||
-rw-r--r-- | board/pcm038/pcm038.c (renamed from board/phycore_pcm038/pcm038.c) | 0 | ||||
-rw-r--r-- | board/pcm038/pcm038.dox (renamed from board/phycore_pcm038/phycore_pcm038.dox) | 2 | ||||
-rw-r--r-- | board/phycore_mpc5200b_tiny/Makefile | 2 | ||||
-rw-r--r-- | include/configs/pcm030.h (renamed from include/configs/phycore_mpc5200b_tiny.h) | 0 | ||||
-rw-r--r-- | include/configs/pcm037.h (renamed from include/configs/phycore_imx31.h) | 0 | ||||
-rw-r--r-- | include/configs/pcm038.h (renamed from include/configs/phycore_pcm038.h) | 0 |
27 files changed, 34 insertions, 27 deletions
diff --git a/Documentation/boards.dox b/Documentation/boards.dox index 0db4257191..1cd5a3717a 100644 --- a/Documentation/boards.dox +++ b/Documentation/boards.dox @@ -1,15 +1,15 @@ /** @page supported_boards Supported Boards -This is a list of boards that are currently supported by U-Bootv2. +This is a list of boards that are currently supported by U-Boot-v2. PowerPC type: -- @subpage phycore_pcm030 +- @subpage pcm030 ARM type: -- @subpage phycore_imx31 -- @subpage phycore_pcm038 +- @subpage pcm037 +- @subpage pcm038 - @subpage scb9328 - @subpage netx @@ -40,6 +40,13 @@ TODO but for memory mapped devices like nor flash we could provide a pointer to it. With this we would not have to copy uimages to memory. +[ ] setting a variable: + bla=500 -> OK + bla = 500 -> Unknown command 'bla' - try 'help' + bla= 500 -> Unknown command '500' - try 'help' + +[ ] command line editing is somewhat broken + DONE ---- diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index b232276b3e..74eaa3bcd9 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -8,7 +8,7 @@ config ARCH_TEXT_BASE default 0x81f00000 if MACH_NXDB500 default 0x21e00000 if MACH_ECO920 default 0xa0000000 if MACH_PCM038 - default 0x87f00000 if MACH_IMX31 + default 0x87f00000 if MACH_PCM037 # # # @@ -19,10 +19,10 @@ config BOARDINFO default "Hilscher Netx nxdb500" if MACH_NXDB500 config BOARDINFO - default "Phytec Phycore MX27" if MACH_PCM038 + default "Phytec phyCORE-i.MX27" if MACH_PCM038 config BOARDINFO - default "Phytec Phycore i.MX31" if MACH_IMX31 + default "Phytec phyCORE-i.MX31" if MACH_PCM037 config BOARD_LINKER_SCRIPT bool @@ -91,11 +91,11 @@ config MACH_SCB9328 Say Y here if you are using the Synertronixx scb9328 board config MACH_PCM038 - bool "Phytec pcm038" + bool "phyCORE-i.MX27" select HAS_CFI select ARCH_IMX27 help - Say Y here if you are using the Phytec Phycore pcm038 equipped + Say Y here if you are using Phytec's phyCORE-i.MX27 (pcm038) equipped with a Freescale i.MX27 Processor config MACH_ECO920 @@ -114,11 +114,11 @@ config MACH_NXDB500 help Say Y here if you are using the Hilscher Netx nxdb500 board -config MACH_IMX31 - bool "Phytec i.MX31" +config MACH_PCM037 + bool "phyCORE-i.MX31" select ARCH_IMX31 help - Say Y here if your are using Phytec's pcm-mx31 equipped + Say Y here if your are using Phytec's phyCORE-i.MX31 (pcm037) equipped with a Freescale i.MX31 Processor endchoice diff --git a/arch/arm/Makefile b/arch/arm/Makefile index 27e4432537..a1a4630a61 100644 --- a/arch/arm/Makefile +++ b/arch/arm/Makefile @@ -10,9 +10,9 @@ machine-$(CONFIG_ARCH_AT91RM9200) := at91rm9200 board-$(CONFIG_MACH_MX1ADS) := mx1ads board-$(CONFIG_MACH_ECO920) := eco920 board-$(CONFIG_MACH_SCB9328) := scb9328 -board-$(CONFIG_MACH_PCM038) := phycore_pcm038 +board-$(CONFIG_MACH_PCM038) := pcm038 board-$(CONFIG_MACH_NXDB500) := netx -board-$(CONFIG_MACH_IMX31) := phycore_imx31 +board-$(CONFIG_MACH_PCM037) := pcm037 # FIXME "cpu-y" never used on ARM! cpu-$(CONFIG_ARM920T) := arm920t cpu-$(CONFIG_ARM926EJS) := arm926ejs diff --git a/arch/arm/configs/phycore_imx31_defconfig b/arch/arm/configs/pcm037_defconfig index 150e27db7c..29651d9918 100644 --- a/arch/arm/configs/phycore_imx31_defconfig +++ b/arch/arm/configs/pcm037_defconfig @@ -4,7 +4,7 @@ # Thu Oct 18 19:32:40 2007 # CONFIG_ARCH_TEXT_BASE=0x87f00000 -CONFIG_BOARDINFO="Phytec Phycore i.MX31" +CONFIG_BOARDINFO="Phytec phyCORE-i.MX31" # CONFIG_BOARD_LINKER_SCRIPT is not set CONFIG_GENERIC_LINKER_SCRIPT=y CONFIG_ARM=y @@ -15,7 +15,7 @@ CONFIG_ARCH_IMX31=y # CONFIG_MACH_PCM038 is not set # CONFIG_MACH_ECO920 is not set # CONFIG_MACH_NXDB500 is not set -CONFIG_MACH_IMX31=y +CONFIG_MACH_PCM037=y # # Arm specific settings @@ -49,7 +49,7 @@ CONFIG_TIMESTAMP=y CONFIG_CONSOLE_ACTIVATE_FIRST=y # CONFIG_OF_FLAT_TREE is not set CONFIG_DEFAULT_ENVIRONMENT=y -CONFIG_DEFAULT_ENVIRONMENT_PATH="board/phycore_imx31/env" +CONFIG_DEFAULT_ENVIRONMENT_PATH="board/pcm037/env" # # Debugging diff --git a/arch/arm/configs/phyCORE-pcm038_defconfig b/arch/arm/configs/pcm038_defconfig index 347dbc9832..f9d2e95d5a 100644 --- a/arch/arm/configs/phyCORE-pcm038_defconfig +++ b/arch/arm/configs/pcm038_defconfig @@ -4,7 +4,7 @@ # Thu Nov 8 16:52:09 2007 # CONFIG_ARCH_TEXT_BASE=0xa0000000 -CONFIG_BOARDINFO="Phytec Phycore MX27" +CONFIG_BOARDINFO="Phytec phyCORE-i.MX27" # CONFIG_BOARD_LINKER_SCRIPT is not set CONFIG_GENERIC_LINKER_SCRIPT=y CONFIG_ARM=y @@ -16,7 +16,7 @@ CONFIG_ARCH_IMX27=y CONFIG_MACH_PCM038=y # CONFIG_MACH_ECO920 is not set # CONFIG_MACH_NXDB500 is not set -# CONFIG_MACH_IMX31 is not set +# CONFIG_MACH_PCM037 is not set # # Arm specific settings diff --git a/arch/arm/configs/scb9328_defconfig b/arch/arm/configs/scb9328_defconfig index ce329d3126..d674acb839 100644 --- a/arch/arm/configs/scb9328_defconfig +++ b/arch/arm/configs/scb9328_defconfig @@ -16,7 +16,7 @@ CONFIG_MACH_SCB9328=y # CONFIG_MACH_PCM038 is not set # CONFIG_MACH_ECO920 is not set # CONFIG_MACH_NXDB500 is not set -# CONFIG_MACH_IMX31 is not set +# CONFIG_MACH_PCM037 is not set # # Arm specific settings diff --git a/arch/ppc/Makefile b/arch/ppc/Makefile index 3645a288df..ff528f2dbb 100644 --- a/arch/ppc/Makefile +++ b/arch/ppc/Makefile @@ -9,7 +9,7 @@ endif machine-$(CONFIG_ARCH_MPC5200) := mpc5200 -board-$(CONFIG_MACH_PHYCORE_MPC5200B_TINY) := phycore_mpc5200b_tiny +board-$(CONFIG_MACH_PHYCORE_MPC5200B_TINY) := pcm030 cpu-$(CONFIG_ARCH_MPC5200) := mpc5xxx TEXT_BASE = $(CONFIG_TEXT_BASE) diff --git a/arch/ppc/configs/phycore_mpc5200b_tiny_defconfig b/arch/ppc/configs/pcm030_defconfig index cd04e16f30..cd04e16f30 100644 --- a/arch/ppc/configs/phycore_mpc5200b_tiny_defconfig +++ b/arch/ppc/configs/pcm030_defconfig diff --git a/board/pcm030/Makefile b/board/pcm030/Makefile new file mode 100644 index 0000000000..bc830dfb73 --- /dev/null +++ b/board/pcm030/Makefile @@ -0,0 +1,2 @@ +obj-y += pcm030.o +extra-y += u-boot.lds diff --git a/board/phycore_mpc5200b_tiny/mt46v32m16-75.h b/board/pcm030/mt46v32m16-75.h index 4d191f1f91..4d191f1f91 100644 --- a/board/phycore_mpc5200b_tiny/mt46v32m16-75.h +++ b/board/pcm030/mt46v32m16-75.h diff --git a/board/phycore_mpc5200b_tiny/phycore_mpc5200b_tiny.c b/board/pcm030/pcm030.c index 39c3b76d91..39c3b76d91 100644 --- a/board/phycore_mpc5200b_tiny/phycore_mpc5200b_tiny.c +++ b/board/pcm030/pcm030.c diff --git a/board/phycore_mpc5200b_tiny/phycore_mpc5200b_tiny.dox b/board/pcm030/pcm030.dox index f43c093f1b..b9ada839f2 100644 --- a/board/phycore_mpc5200b_tiny/phycore_mpc5200b_tiny.dox +++ b/board/pcm030/pcm030.dox @@ -1,4 +1,4 @@ -/** @page phycore_pcm030 Phytec's phyCORE-pcm030 +/** @page pcm030 Phytec's phyCORE-MPC5200B-tiny This CPU card is based on a Freescale MPC5200B CPU. The card is shipped with: diff --git a/board/phycore_mpc5200b_tiny/u-boot.lds.S b/board/pcm030/u-boot.lds.S index 1d7ce706d2..1d7ce706d2 100644 --- a/board/phycore_mpc5200b_tiny/u-boot.lds.S +++ b/board/pcm030/u-boot.lds.S diff --git a/board/phycore_imx31/Makefile b/board/pcm037/Makefile index f2dbdb61b8..7d36b77df0 100644 --- a/board/phycore_imx31/Makefile +++ b/board/pcm037/Makefile @@ -21,4 +21,4 @@ # obj-y += lowlevel_init.o -obj-y += phycore_imx31.o +obj-y += pcm037.o diff --git a/board/phycore_imx31/env/bin/init b/board/pcm037/env/bin/init index b75a9af2df..b75a9af2df 100644 --- a/board/phycore_imx31/env/bin/init +++ b/board/pcm037/env/bin/init diff --git a/board/phycore_imx31/lowlevel_init.S b/board/pcm037/lowlevel_init.S index 12fe5fa7ef..12fe5fa7ef 100644 --- a/board/phycore_imx31/lowlevel_init.S +++ b/board/pcm037/lowlevel_init.S diff --git a/board/phycore_imx31/phycore_imx31.c b/board/pcm037/pcm037.c index 8f39e42d63..8f39e42d63 100644 --- a/board/phycore_imx31/phycore_imx31.c +++ b/board/pcm037/pcm037.c diff --git a/board/phycore_imx31/phycore_imx31.dox b/board/pcm037/pcm037.dox index d6c0010fed..b2afdd6acd 100644 --- a/board/phycore_imx31/phycore_imx31.dox +++ b/board/pcm037/pcm037.dox @@ -1,4 +1,4 @@ -/** @page phycore_imx31 Phytec's phyCORE-pcm037 +/** @page pcm037 Phytec's phyCORE-i.MX31 This CPU card is based on a Freescale i.MX31 CPU. The card is shipped with: diff --git a/board/phycore_pcm038/Makefile b/board/pcm038/Makefile index 6082b2d657..6082b2d657 100644 --- a/board/phycore_pcm038/Makefile +++ b/board/pcm038/Makefile diff --git a/board/phycore_pcm038/lowlevel_init.S b/board/pcm038/lowlevel_init.S index fc65b902b6..fc65b902b6 100644 --- a/board/phycore_pcm038/lowlevel_init.S +++ b/board/pcm038/lowlevel_init.S diff --git a/board/phycore_pcm038/pcm038.c b/board/pcm038/pcm038.c index 99cbc5eec4..99cbc5eec4 100644 --- a/board/phycore_pcm038/pcm038.c +++ b/board/pcm038/pcm038.c diff --git a/board/phycore_pcm038/phycore_pcm038.dox b/board/pcm038/pcm038.dox index 95294beb8f..9b17674a21 100644 --- a/board/phycore_pcm038/phycore_pcm038.dox +++ b/board/pcm038/pcm038.dox @@ -1,4 +1,4 @@ -/** @page phycore_pcm038 Phytec's phyCORE-pcm038 +/** @page pcm038 Phytec's phyCORE-i.MX27 This CPU card is based on a Freescale i.MX27 CPU. The card is shipped with: diff --git a/board/phycore_mpc5200b_tiny/Makefile b/board/phycore_mpc5200b_tiny/Makefile deleted file mode 100644 index bd0c86d32d..0000000000 --- a/board/phycore_mpc5200b_tiny/Makefile +++ /dev/null @@ -1,2 +0,0 @@ -obj-y += phycore_mpc5200b_tiny.o -extra-y += u-boot.lds diff --git a/include/configs/phycore_mpc5200b_tiny.h b/include/configs/pcm030.h index 339ea71f8b..339ea71f8b 100644 --- a/include/configs/phycore_mpc5200b_tiny.h +++ b/include/configs/pcm030.h diff --git a/include/configs/phycore_imx31.h b/include/configs/pcm037.h index ea987accb8..ea987accb8 100644 --- a/include/configs/phycore_imx31.h +++ b/include/configs/pcm037.h diff --git a/include/configs/phycore_pcm038.h b/include/configs/pcm038.h index cbd3e1674d..cbd3e1674d 100644 --- a/include/configs/phycore_pcm038.h +++ b/include/configs/pcm038.h |