ppc/85xx: Simplify the top makefile for 36-bit config for MPC8572DS
PATCH 1/1 ppc/85xx: Simplify the top makefile for 36-bit config for MPC8572DS
Signed-off-by Kumar Gala <[email protected]>
--- Makefile | 7 +------ include/configs/MPC8572DS.h | 4 ++++ 2 files changed, 5 insertions(+), 6 deletions(-)
Makefile +1 -6
@@ -2514,12 +2514,7 @@ MPC8569MDS_config: unconfig MPC8572DS_36BIT_config \ MPC8572DS_config: unconfig - @mkdir -p $(obj)include - @if [ "$(findstring _36BIT_,$@)" ] ; then \ - echo "#define CONFIG_PHYS_64BIT" >>$(obj)include/config.h ; \ - $(XECHO) "... enabling 36-bit physical addressing." ; \ - fi - @$(MKCONFIG) -a MPC8572DS ppc mpc85xx mpc8572ds freescale + @$(MKCONFIG) -n $(@:_config=) MPC8572DS ppc mpc85xx mpc8572ds freescale P2020DS_36BIT_config \ P2020DS_config: unconfig
include/configs/MPC8572DS.h +4 -0
@@ -27,6 +27,10 @@#ifndef __CONFIG_H#define __CONFIG_H +#ifdef CONFIG_MK_MPC8572DS_36BIT +#define CONFIG_PHYS_64BIT +#endif +/* High Level Configuration Options */ #define CONFIG_BOOKE 1/* BOOKE */ #define CONFIG_E500 1/* BOOKE e500 family */
Signature · 1 line
1.6.0.6
PATCH 1/1 ppc/85xx: Simplify the top makefile for 36-bit config for P2020DS
Signed-off-by Kumar Gala <[email protected]>
--- Makefile | 7 +------ include/configs/P2020DS.h | 4 ++++ 2 files changed, 5 insertions(+), 6 deletions(-)
Makefile +1 -6
@@ -2518,12 +2518,7 @@ MPC8572DS_config: unconfig P2020DS_36BIT_config \ P2020DS_config: unconfig - @mkdir -p $(obj)include - @if [ "$(findstring _36BIT_,$@)" ] ; then \ - echo "#define CONFIG_PHYS_64BIT" >>$(obj)include/config.h ; \ - $(XECHO) "... enabling 36-bit physical addressing." ; \ - fi - @$(MKCONFIG) -a P2020DS ppc mpc85xx p2020ds freescale + @$(MKCONFIG) -n $(@:_config=) P2020DS ppc mpc85xx p2020ds freescale P1011RDB_config: unconfig @mkdir -p $(obj)include
include/configs/P2020DS.h +4 -0
@@ -27,6 +27,10 @@#ifndef __CONFIG_H#define __CONFIG_H +#ifdef CONFIG_MK_P2020DS_36BIT +#define CONFIG_PHYS_64BIT +#endif +/* High Level Configuration Options */ #define CONFIG_BOOKE 1/* BOOKE */ #define CONFIG_E500 1/* BOOKE e500 family */
Signature · 1 line
1.6.0.6
PATCH 1/1 ppc/85xx: Simplify the top makefile for P1_P2_RDB boards
Signed-off-by Kumar Gala <[email protected]>
--- Makefile | 22 ++++------------------ include/configs/P1_P2_RDB.h | 13 +++++++++++++ 2 files changed, 17 insertions(+), 18 deletions(-)
Makefile +4 -18
@@ -2520,25 +2520,11 @@ P2020DS_36BIT_config \ P2020DS_config: unconfig @$(MKCONFIG) -n $(@:_config=) P2020DS ppc mpc85xx p2020ds freescale -P1011RDB_config: unconfig - @mkdir -p $(obj)include - @echo "#define CONFIG_P1011" >>$(obj)include/config.h ; - @$(MKCONFIG) -a P1_P2_RDB ppc mpc85xx p1_p2_rdb freescale - -P1020RDB_config: unconfig - @mkdir -p $(obj)include - @echo "#define CONFIG_P1020" >>$(obj)include/config.h ; - @$(MKCONFIG) -a P1_P2_RDB ppc mpc85xx p1_p2_rdb freescale - -P2010RDB_config: unconfig - @mkdir -p $(obj)include - @echo "#define CONFIG_P2010" >>$(obj)include/config.h ; - @$(MKCONFIG) -a P1_P2_RDB ppc mpc85xx p1_p2_rdb freescale - +P1011RDB_config \ +P1020RDB_config \ +P2010RDB_config \ P2020RDB_config: unconfig - @mkdir -p $(obj)include - @echo "#define CONFIG_P2020" >>$(obj)include/config.h ; - @$(MKCONFIG) -a P1_P2_RDB ppc mpc85xx p1_p2_rdb freescale + @$(MKCONFIG) -n $(@:_config=) P1_P2_RDB ppc mpc85xx p1_p2_rdb freescale PM854_config: unconfig @$(MKCONFIG) $(@:_config=) ppc mpc85xx pm854
include/configs/P1_P2_RDB.h +13 -0
@@ -30,6 +30,19 @@#ifndef __CONFIG_H#define __CONFIG_H +#ifdef CONFIG_MK_P1011RDB +#define CONFIG_P1011 +#endif +#ifdef CONFIG_MK_P1020RDB +#define CONFIG_P1020 +#endif +#ifdef CONFIG_MK_P2010RDB +#define CONFIG_P2010 +#endif +#ifdef CONFIG_MK_P2020RDB +#define CONFIG_P2020 +#endif +/* High Level Configuration Options */ #define CONFIG_BOOKE 1/* BOOKE */ #define CONFIG_E500 1/* BOOKE e500 family */
Signature · 1 line
1.6.0.6
PATCH 1/1 ppc/85xx: Simplify the top makefile for P1_P2_RDB boards
Quoted 15 lines · Kumar Gala
include/configs/P2020DS.h +4
-0@@ -27,6 +27,10 @@#ifndef __CONFIG_H#define __CONFIG_H +#ifdef CONFIG_MK_P2020DS_36BIT +#define CONFIG_PHYS_64BIT +#endif +/* High Level Configuration Options */ #define CONFIG_BOOKE 1/* BOOKE */ #define CONFIG_E500 1/* BOOKE e500 family */
[snip]
Quoted 10 lines
include/configs/P1_P2_RDB.h +2
-0@@ -30,6 +30,19 @@#ifndef __CONFIG_H#define __CONFIG_H +#ifdef CONFIG_MK_P1011RDB +#define CONFIG_P1011
include/configs/P1_P2_RDB.h line 44
Quoted 10 lines
include/configs/P1_P2_RDB.h +10
-0+#endif +#ifdef CONFIG_MK_P1020RDB +#define CONFIG_P1020 +#endif +#ifdef CONFIG_MK_P2010RDB +#define CONFIG_P2010 +#endif +#ifdef CONFIG_MK_P2020RDB +#define CONFIG_P2020 +#endif
I hope nobody ever wants to stick an alternate boot source (such as NAND), board revs, 36 bit, etc. on top of this 4-way choice.
I thought Wolfgang had finally agreed to the splitting approach. :-(
-Scott