From: Stany MARCEL <stany.marcel@novasys-ingenierie.com>
To: u-boot@lists.denx.de
Subject: [U-Boot] [PATCH 3/6 v2] ColdFire: Move boards with simple _config rules to boards.cfg
Date: Fri, 14 Oct 2011 16:38:03 +0200 [thread overview]
Message-ID: <1318603086-9996-3-git-send-email-stany.marcel@novasys-ingenierie.com> (raw)
In-Reply-To: <20111013195836.0F8A214094B4@gemini.denx.de>
Signed-off-by: Stany MARCEL <stany.marcel@novasys-ingenierie.com>
---
Changes for v2:
- rebase to master
MAKEALL | 6 ---
Makefile | 96 --------------------------------------------
boards.cfg | 21 +++++++++-
include/configs/M5329EVB.h | 8 ++--
4 files changed, 24 insertions(+), 107 deletions(-)
diff --git a/MAKEALL b/MAKEALL
index f582f8b..cbbf269 100755
--- a/MAKEALL
+++ b/MAKEALL
@@ -440,18 +440,12 @@ LIST_microblaze="$(boards_by_arch microblaze)"
#########################################################################
LIST_m68k="$(boards_by_arch m68k)
- astro_mcf5373l \
- cobra5272 \
EB+MCF-EV123 \
EB+MCF-EV123_internal \
M52277EVB \
M5235EVB \
- M5329AFEE \
- M5373EVB \
M54451EVB \
M54455EVB \
- M5475AFE \
- M5485AFE \
"
LIST_coldfire=${LIST_m68k}
diff --git a/Makefile b/Makefile
index 5db2e0e..642f35e 100644
--- a/Makefile
+++ b/Makefile
@@ -611,11 +611,6 @@ ucname = $(shell echo $(1) | sed -e 's/\(.*\)_config/\U\1/')
#########################################################################
## Coldfire
#########################################################################
-
-astro_mcf5373l_config \
-astro_mcf5373l_RAM_config : unconfig
- @$(MKCONFIG) -n $@ -t $@ astro_mcf5373l m68k mcf532x mcf5373l astro
-
M52277EVB_config \
M52277EVB_spansion_config \
M52277EVB_stmicro_config : unconfig
@@ -655,9 +650,6 @@ M5235EVB_Flash32_config: unconfig
fi
@$(MKCONFIG) -n $@ -a M5235EVB m68k mcf523x m5235evb freescale
-cobra5272_config : unconfig
- @$(MKCONFIG) $@ m68k mcf52x2 cobra5272
-
EB+MCF-EV123_config : unconfig
@mkdir -p $(obj)include
@mkdir -p $(obj)board/BuS/EB+MCF-EV123
@@ -670,26 +662,6 @@ EB+MCF-EV123_internal_config : unconfig
@echo "CONFIG_SYS_TEXT_BASE = 0xF0000000"|tee $(obj)board/BuS/EB+MCF-EV123/textbase.mk
@$(MKCONFIG) -n $@ EB+MCF-EV123 m68k mcf52x2 EB+MCF-EV123 BuS
-M5329AFEE_config \
-M5329BFEE_config : unconfig
- @case "$@" in \
- M5329AFEE_config) NAND=0;; \
- M5329BFEE_config) NAND=16;; \
- esac; \
- if [ "$${NAND}" != "0" ] ; then \
- echo "#define NANDFLASH_SIZE $${NAND}" > $(obj)include/config.h ; \
- fi
- @$(MKCONFIG) -n $@ -a M5329EVB m68k mcf532x m5329evb freescale
-
-M5373EVB_config : unconfig
- @case "$@" in \
- M5373EVB_config) NAND=16;; \
- esac; \
- if [ "$${NAND}" != "0" ] ; then \
- echo "#define NANDFLASH_SIZE $${NAND}" > $(obj)include/config.h ; \
- fi
- @$(MKCONFIG) -a M5373EVB m68k mcf532x m5373evb freescale
-
M54451EVB_config \
M54451EVB_stmicro_config : unconfig
@case "$@" in \
@@ -747,74 +719,6 @@ M54455EVB_stm33_config : unconfig
$(XECHO) "... with $${FREQ}Hz input clock"
@$(MKCONFIG) -n $@ -a M54455EVB m68k mcf5445x m54455evb freescale
-M5475AFE_config \
-M5475BFE_config \
-M5475CFE_config \
-M5475DFE_config \
-M5475EFE_config \
-M5475FFE_config \
-M5475GFE_config : unconfig
- @case "$@" in \
- M5475AFE_config) BOOT=2;CODE=0;VID=0;USB=0;RAM=64;RAM1=0;; \
- M5475BFE_config) BOOT=2;CODE=16;VID=0;USB=0;RAM=64;RAM1=0;; \
- M5475CFE_config) BOOT=2;CODE=16;VID=1;USB=1;RAM=64;RAM1=0;; \
- M5475DFE_config) BOOT=2;CODE=0;VID=0;USB=1;RAM=64;RAM1=0;; \
- M5475EFE_config) BOOT=2;CODE=0;VID=1;USB=1;RAM=64;RAM1=0;; \
- M5475FFE_config) BOOT=2;CODE=32;VID=1;USB=1;RAM=64;RAM1=64;; \
- M5475GFE_config) BOOT=4;CODE=0;VID=0;USB=0;RAM=64;RAM1=0;; \
- esac; \
- echo "#define CONFIG_SYS_BUSCLK 133333333" > $(obj)include/config.h ; \
- echo "#define CONFIG_SYS_BOOTSZ $${BOOT}" >> $(obj)include/config.h ; \
- echo "#define CONFIG_SYS_DRAMSZ $${RAM}" >> $(obj)include/config.h ; \
- if [ "$${RAM1}" != "0" ] ; then \
- echo "#define CONFIG_SYS_DRAMSZ1 $${RAM1}" >> $(obj)include/config.h ; \
- fi; \
- if [ "$${CODE}" != "0" ] ; then \
- echo "#define CONFIG_SYS_NOR1SZ $${CODE}" >> $(obj)include/config.h ; \
- fi; \
- if [ "$${VID}" == "1" ] ; then \
- echo "#define CONFIG_SYS_VIDEO" >> $(obj)include/config.h ; \
- fi; \
- if [ "$${USB}" == "1" ] ; then \
- echo "#define CONFIG_SYS_USBCTRL" >> $(obj)include/config.h ; \
- fi
- @$(MKCONFIG) -n $@ -a M5475EVB m68k mcf547x_8x m547xevb freescale
-
-M5485AFE_config \
-M5485BFE_config \
-M5485CFE_config \
-M5485DFE_config \
-M5485EFE_config \
-M5485FFE_config \
-M5485GFE_config \
-M5485HFE_config : unconfig
- @case "$@" in \
- M5485AFE_config) BOOT=2;CODE=0;VID=0;USB=0;RAM=64;RAM1=0;; \
- M5485BFE_config) BOOT=2;CODE=16;VID=0;USB=0;RAM=64;RAM1=0;; \
- M5485CFE_config) BOOT=2;CODE=16;VID=1;USB=1;RAM=64;RAM1=0;; \
- M5485DFE_config) BOOT=2;CODE=0;VID=0;USB=1;RAM=64;RAM1=0;; \
- M5485EFE_config) BOOT=2;CODE=0;VID=1;USB=1;RAM=64;RAM1=0;; \
- M5485FFE_config) BOOT=2;CODE=32;VID=1;USB=1;RAM=64;RAM1=64;; \
- M5485GFE_config) BOOT=4;CODE=0;VID=0;USB=0;RAM=64;RAM1=0;; \
- M5485HFE_config) BOOT=2;CODE=16;VID=1;USB=0;RAM=64;RAM1=0;; \
- esac; \
- echo "#define CONFIG_SYS_BUSCLK 100000000" > $(obj)include/config.h ; \
- echo "#define CONFIG_SYS_BOOTSZ $${BOOT}" >> $(obj)include/config.h ; \
- echo "#define CONFIG_SYS_DRAMSZ $${RAM}" >> $(obj)include/config.h ; \
- if [ "$${RAM1}" != "0" ] ; then \
- echo "#define CONFIG_SYS_DRAMSZ1 $${RAM1}" >> $(obj)include/config.h ; \
- fi; \
- if [ "$${CODE}" != "0" ] ; then \
- echo "#define CONFIG_SYS_NOR1SZ $${CODE}" >> $(obj)include/config.h ; \
- fi; \
- if [ "$${VID}" == "1" ] ; then \
- echo "#define CONFIG_SYS_VIDEO" >> $(obj)include/config.h ; \
- fi; \
- if [ "$${USB}" == "1" ] ; then \
- echo "#define CONFIG_SYS_USBCTRL" >> $(obj)include/config.h ; \
- fi
- @$(MKCONFIG) -n $@ -a M5485EVB m68k mcf547x_8x m548xevb freescale
-
#========================================================================
# ARM
#========================================================================
diff --git a/boards.cfg b/boards.cfg
index d3d610d..16023b9 100644
--- a/boards.cfg
+++ b/boards.cfg
@@ -264,6 +264,7 @@ tcm-bf518 blackfin blackfin
tcm-bf537 blackfin blackfin
eNET x86 x86 eNET - sc520 eNET:SYS_TEXT_BASE=0x38040000
eNET_SRAM x86 x86 eNET - sc520 eNET:SYS_TEXT_BASE=0x19000000
+cobra5272 m68k mcf52x2 cobra5272 -
idmr m68k mcf52x2
TASREG m68k mcf52x2 tasreg esd
M5208EVBE m68k mcf52x2 m5208evbe freescale
@@ -274,8 +275,26 @@ M5271EVB m68k mcf52x2 m5271evb freesca
M5272C3 m68k mcf52x2 m5272c3 freescale
M5275EVB m68k mcf52x2 m5275evb freescale
M5282EVB m68k mcf52x2 m5282evb freescale
+astro_mcf5373l m68k mcf532x mcf5373l astro
M53017EVB m68k mcf532x m53017evb freescale
-EP2500 m68k mcf52x2 ep2500 Mercury
+M5329AFEE m68k mcf532x m5329evb freescale - M5329EVB:NANDFLASH_SIZE=0
+M5329BFEE m68k mcf532x m5329evb freescale - M5329EVB:NANDFLASH_SIZE=16
+M5373EVB m68k mcf532x m5373evb freescale - M5373EVB:NANDFLASH_SIZE=16
+M5475AFE m68k mcf547x_8x m547xevb freescale - M5475EVB:SYS_BUSCLK=133333333,SYS_BOOTSZ=2,SYS_DRAMSZ=64
+M5475BFE m68k mcf547x_8x m547xevb freescale - M5475EVB:SYS_BUSCLK=133333333,SYS_BOOTSZ=2,SYS_DRAMSZ=64,SYS_NOR1SZ=16
+M5475CFE m68k mcf547x_8x m547xevb freescale - M5475EVB:SYS_BUSCLK=133333333,SYS_BOOTSZ=2,SYS_DRAMSZ=64,SYS_NOR1SZ=16,SYS_VIDEO,SYS_USBCTRL
+M5475DFE m68k mcf547x_8x m547xevb freescale - M5475EVB:SYS_BUSCLK=133333333,SYS_BOOTSZ=2,SYS_DRAMSZ=64,SYS_USBCTRL
+M5475EFE m68k mcf547x_8x m547xevb freescale - M5475EVB:SYS_BUSCLK=133333333,SYS_BOOTSZ=2,SYS_DRAMSZ=64,SYS_VIDEO,SYS_USBCTRL
+M5475FFE m68k mcf547x_8x m547xevb freescale - M5475EVB:SYS_BUSCLK=133333333,SYS_BOOTSZ=2,SYS_DRAMSZ=64,SYS_NOR1SZ=32,SYS_VIDEO,SYS_USBCTRL,SYS_DRAMSZ1=64
+M5475GFE m68k mcf547x_8x m547xevb freescale - M5475EVB:SYS_BUSCLK=133333333,SYS_BOOTSZ=4,SYS_DRAMSZ=64
+M5485AFE m68k mcf547x_8x m548xevb freescale - M5485EVB:SYS_BUSCLK=100000000,SYS_BOOTSZ=2,SYS_DRAMSZ=64
+M5485BFE m68k mcf547x_8x m548xevb freescale - M5485EVB:SYS_BUSCLK=100000000,SYS_BOOTSZ=2,SYS_DRAMSZ=64,SYS_NOR1SZ=16
+M5485CFE m68k mcf547x_8x m548xevb freescale - M5485EVB:SYS_BUSCLK=100000000,SYS_BOOTSZ=2,SYS_DRAMSZ=64,SYS_NOR1SZ=16,SYS_VIDEO,SYS_USBCTRL
+M5485DFE m68k mcf547x_8x m548xevb freescale - M5485EVB:SYS_BUSCLK=100000000,SYS_BOOTSZ=2,SYS_DRAMSZ=64,SYS_USBCTRL
+M5485EFE m68k mcf547x_8x m548xevb freescale - M5485EVB:SYS_BUSCLK=100000000,SYS_BOOTSZ=2,SYS_DRAMSZ=64,SYS_VIDEO,SYS_USBCTRL
+M5485FFE m68k mcf547x_8x m548xevb freescale - M5485EVB:SYS_BUSCLK=100000000,SYS_BOOTSZ=2,SYS_DRAMSZ=64,SYS_NOR1SZ=32,SYS_VIDEO,SYS_USBCTRL,SYS_DRAMSZ1=64
+M5485GFE m68k mcf547x_8x m548xevb freescale - M5485EVB:SYS_BUSCLK=100000000,SYS_BOOTSZ=4,SYS_DRAMSZ=64
+M5485HFE m68k mcf547x_8x m548xevb freescale - M5485EVB:SYS_BUSCLK=100000000,SYS_BOOTSZ=2,SYS_DRAMSZ=64,SYS_NOR1SZ=16,SYS_VIDEO
microblaze-generic microblaze microblaze microblaze-generic xilinx
dbau1000 mips mips32 dbau1x00 - au1x00 dbau1x00:DBAU1000
dbau1100 mips mips32 dbau1x00 - au1x00 dbau1x00:DBAU1100
diff --git a/include/configs/M5329EVB.h b/include/configs/M5329EVB.h
index 67cdff1..29b9b2a 100644
--- a/include/configs/M5329EVB.h
+++ b/include/configs/M5329EVB.h
@@ -60,7 +60,7 @@
#define CONFIG_CMD_PING
#define CONFIG_CMD_REGINFO
-#ifdef NANDFLASH_SIZE
+#ifdef CONFIG_NANDFLASH_SIZE
# define CONFIG_CMD_NAND
#endif
@@ -209,7 +209,7 @@
# define CONFIG_SYS_FLASH_PROTECTION /* "Real" (hardware) sectors protection */
#endif
-#ifdef NANDFLASH_SIZE
+#ifdef CONFIG_NANDFLASH_SIZE
# define CONFIG_SYS_MAX_NAND_DEVICE 1
# define CONFIG_SYS_NAND_BASE CONFIG_SYS_CS2_BASE
# define CONFIG_SYS_NAND_SIZE 1
@@ -265,9 +265,9 @@
#define CONFIG_SYS_CS1_MASK 0x001f0001
#define CONFIG_SYS_CS1_CTRL 0x002A3780
-#ifdef NANDFLASH_SIZE
+#ifdef CONFIG_NANDFLASH_SIZE
#define CONFIG_SYS_CS2_BASE 0x20000000
-#define CONFIG_SYS_CS2_MASK ((NANDFLASH_SIZE << 20) | 1)
+#define CONFIG_SYS_CS2_MASK ((CONFIG_NANDFLASH_SIZE << 20) | 1)
#define CONFIG_SYS_CS2_CTRL 0x00001f60
#endif
--
1.7.1
next prev parent reply other threads:[~2011-10-14 14:38 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-09-14 12:44 [U-Boot] [PATCH 1/6] ColdFire: Cleanup lds files for multiple defined symbols Stany MARCEL
2011-09-14 12:44 ` [U-Boot] [PATCH 2/6] ColdFire: Add $(obj) before cpu lib to correct build Stany MARCEL
2011-09-14 12:44 ` [U-Boot] [PATCH 3/6] ColdFire: Move boards with simple _config rules to boards.cfg Stany MARCEL
2011-09-16 7:48 ` Jin Zhengxiong-R64188
2011-09-16 20:05 ` Stany MARCEL
2011-09-14 12:44 ` [U-Boot] [PATCH 4/6] ColdFire: Merge differentiated linking files into a sigle one by board Stany MARCEL
2011-09-14 12:44 ` [U-Boot] [PATCH 5/6] ColdFire: Clean Makefile _config rules Stany MARCEL
2011-09-14 12:44 ` [U-Boot] [PATCH 6/6] ColdFire: Fix compilation with CONFIG_SYS_DRAMSZ1 defined Stany MARCEL
2011-09-16 7:48 ` [U-Boot] [PATCH 1/6] ColdFire: Cleanup lds files for multiple defined symbols Jin Zhengxiong-R64188
2011-09-16 20:11 ` Stany MARCEL
2011-10-09 20:16 ` Stany MARCEL
2011-10-12 3:52 ` Jin Zhengxiong-R64188
2011-10-12 7:22 ` Stany MARCEL
2011-10-13 19:58 ` Wolfgang Denk
2011-10-14 14:38 ` [U-Boot] [PATCH 1/6 v2] " Stany MARCEL
2011-10-15 20:07 ` Mike Frysinger
2011-10-14 14:38 ` [U-Boot] [PATCH 2/6 v2] ColdFire: Add $(obj) before cpu lib to correct build Stany MARCEL
2011-10-14 14:38 ` Stany MARCEL [this message]
2011-10-14 14:38 ` [U-Boot] [PATCH 4/6 v2] ColdFire: Merge differentiated linking files into a sigle one by board Stany MARCEL
2011-10-14 14:38 ` [U-Boot] [PATCH 5/6 v2] ColdFire: Clean Makefile _config rules Stany MARCEL
2011-10-14 14:38 ` [U-Boot] [PATCH 6/6 v2] ColdFire: Fix compilation with CONFIG_SYS_DRAMSZ1 defined Stany MARCEL
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1318603086-9996-3-git-send-email-stany.marcel@novasys-ingenierie.com \
--to=stany.marcel@novasys-ingenierie.com \
--cc=u-boot@lists.denx.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.