[U-Boot-Users] [PATCH] Separate 83xx, 85xx, and 86xx configurations into their own Makefiles
This patch moves the board configuration rules for 83xx, 85xx, and 86xx boards into their own makefiles. All 83xx boards are now configured in Makefile.83xx, all 85xx boards are in Makefile.85xx, and all 86xx boards are in Makefile.86xx. With separate maintainers for these families, this patch allows new boards to be added without having merge conflicts.
Signed-off-by: Timur Tabi timur@freescale.com --- Makefile | 123 +------------------------------------------------------- Makefile.83xx | 33 +++++++++++++++ Makefile.85xx | 86 ++++++++++++++++++++++++++++++++++++++++ Makefile.86xx | 3 + 4 files changed, 125 insertions(+), 120 deletions(-)
diff --git a/Makefile b/Makefile index b1952ed..500d679 100644 --- a/Makefile +++ b/Makefile @@ -1607,136 +1607,19 @@ r5200_config : unconfig ## MPC83xx Systems #########################################################################
-TQM834x_config: unconfig - @$(MKCONFIG) $(@:_config=) ppc mpc83xx tqm834x - -MPC8349EMDS_config: unconfig - @$(MKCONFIG) $(@:_config=) ppc mpc83xx mpc8349emds - -MPC8360EMDS_config \ -MPC8360EMDS_HOST_33_config \ -MPC8360EMDS_HOST_66_config \ -MPC8360EMDS_SLAVE_config: unconfig - @echo "" >include/config.h ; \ - if [ "$(findstring _HOST_,$@)" ] ; then \ - echo -n "... PCI HOST " ; \ - echo "#define CONFIG_PCI" >>include/config.h ; \ - fi ; \ - if [ "$(findstring _SLAVE_,$@)" ] ; then \ - echo "...PCI SLAVE 66M" ; \ - echo "#define CONFIG_PCI" >>include/config.h ; \ - echo "#define CONFIG_PCISLAVE" >>include/config.h ; \ - fi ; \ - if [ "$(findstring _33_,$@)" ] ; then \ - echo -n "...33M ..." ; \ - echo "#define PCI_33M" >>include/config.h ; \ - fi ; \ - if [ "$(findstring _66_,$@)" ] ; then \ - echo -n "...66M..." ; \ - echo "#define PCI_66M" >>include/config.h ; \ - fi ; - @$(MKCONFIG) -a MPC8360EMDS ppc mpc83xx mpc8360emds - -MPC8349ITX_config: unconfig - @$(MKCONFIG) $(@:_config=) ppc mpc83xx mpc8349itx +include Makefile.83xx
######################################################################### ## MPC85xx Systems #########################################################################
-MPC8540ADS_config: unconfig - @$(MKCONFIG) $(@:_config=) ppc mpc85xx mpc8540ads - -MPC8540EVAL_config \ -MPC8540EVAL_33_config \ -MPC8540EVAL_66_config \ -MPC8540EVAL_33_slave_config \ -MPC8540EVAL_66_slave_config: unconfig - @mkdir -p $(obj)include - @echo "" >$(obj)include/config.h ; \ - if [ "$(findstring _33_,$@)" ] ; then \ - echo -n "... 33 MHz PCI" ; \ - else \ - echo "#define CONFIG_SYSCLK_66M" >>$(obj)include/config.h ; \ - echo -n "... 66 MHz PCI" ; \ - fi ; \ - if [ "$(findstring _slave_,$@)" ] ; then \ - echo "#define CONFIG_PCI_SLAVE" >>$(obj)include/config.h ; \ - echo " slave" ; \ - else \ - echo " host" ; \ - fi - @$(MKCONFIG) -a MPC8540EVAL ppc mpc85xx mpc8540eval - -MPC8560ADS_config: unconfig - @$(MKCONFIG) $(@:_config=) ppc mpc85xx mpc8560ads - -MPC8541CDS_config: unconfig - @$(MKCONFIG) $(@:_config=) ppc mpc85xx mpc8541cds cds - -MPC8548CDS_config: unconfig - @$(MKCONFIG) $(@:_config=) ppc mpc85xx mpc8548cds cds - -MPC8555CDS_config: unconfig - @$(MKCONFIG) $(@:_config=) ppc mpc85xx mpc8555cds cds - -PM854_config: unconfig - @$(MKCONFIG) $(@:_config=) ppc mpc85xx pm854 - -PM856_config: unconfig - @$(MKCONFIG) $(@:_config=) ppc mpc85xx pm856 - -sbc8540_config \ -sbc8540_33_config \ -sbc8540_66_config: unconfig - @mkdir -p $(obj)include - @if [ "$(findstring _66_,$@)" ] ; then \ - echo "#define CONFIG_PCI_66" >>$(obj)include/config.h ; \ - echo "... 66 MHz PCI" ; \ - else \ - >$(obj)include/config.h ; \ - echo "... 33 MHz PCI" ; \ - fi - @$(MKCONFIG) -a SBC8540 ppc mpc85xx sbc8560 - -sbc8560_config \ -sbc8560_33_config \ -sbc8560_66_config: unconfig - @mkdir -p $(obj)include - @if [ "$(findstring _66_,$@)" ] ; then \ - echo "#define CONFIG_PCI_66" >>$(obj)include/config.h ; \ - echo "... 66 MHz PCI" ; \ - else \ - >$(obj)include/config.h ; \ - echo "... 33 MHz PCI" ; \ - fi - @$(MKCONFIG) -a sbc8560 ppc mpc85xx sbc8560 - -stxgp3_config: unconfig - @$(MKCONFIG) $(@:_config=) ppc mpc85xx stxgp3 - -TQM8540_config \ -TQM8541_config \ -TQM8555_config \ -TQM8560_config: unconfig - @mkdir -p $(obj)include - @CTYPE=$(subst TQM,,$(@:_config=)); \ - >$(obj)include/config.h ; \ - echo "... TQM"$${CTYPE}; \ - echo "#define CONFIG_MPC$${CTYPE}">>$(obj)include/config.h; \ - echo "#define CONFIG_TQM$${CTYPE}">>$(obj)include/config.h; \ - echo "#define CONFIG_HOSTNAME tqm$${CTYPE}">>$(obj)include/config.h; \ - echo "#define CONFIG_BOARDNAME "TQM$${CTYPE}"">>$(obj)include/config.h; \ - echo "#define CFG_BOOTFILE "bootfile=/tftpboot/tqm$${CTYPE}/uImage\0"">>$(obj)include/config.h - @$(MKCONFIG) -a TQM85xx ppc mpc85xx tqm85xx +include Makefile.85xx
######################################################################### ## MPC86xx Systems #########################################################################
-MPC8641HPCN_config: unconfig - @./mkconfig $(@:_config=) ppc mpc86xx mpc8641hpcn - +include Makefile.86xx
######################################################################### ## 74xx/7xx Systems diff --git a/Makefile.83xx b/Makefile.83xx new file mode 100644 index 0000000..f9e1400 --- /dev/null +++ b/Makefile.83xx @@ -0,0 +1,33 @@ +TQM834x_config: unconfig + @$(MKCONFIG) $(@:_config=) ppc mpc83xx tqm834x + +MPC8349EMDS_config: unconfig + @$(MKCONFIG) $(@:_config=) ppc mpc83xx mpc8349emds + +MPC8360EMDS_config \ +MPC8360EMDS_HOST_33_config \ +MPC8360EMDS_HOST_66_config \ +MPC8360EMDS_SLAVE_config: unconfig + @echo "" >include/config.h ; \ + if [ "$(findstring _HOST_,$@)" ] ; then \ + echo -n "... PCI HOST " ; \ + echo "#define CONFIG_PCI" >>include/config.h ; \ + fi ; \ + if [ "$(findstring _SLAVE_,$@)" ] ; then \ + echo "...PCI SLAVE 66M" ; \ + echo "#define CONFIG_PCI" >>include/config.h ; \ + echo "#define CONFIG_PCISLAVE" >>include/config.h ; \ + fi ; \ + if [ "$(findstring _33_,$@)" ] ; then \ + echo -n "...33M ..." ; \ + echo "#define PCI_33M" >>include/config.h ; \ + fi ; \ + if [ "$(findstring _66_,$@)" ] ; then \ + echo -n "...66M..." ; \ + echo "#define PCI_66M" >>include/config.h ; \ + fi ; + @$(MKCONFIG) -a MPC8360EMDS ppc mpc83xx mpc8360emds + +MPC8349ITX_config: unconfig + @$(MKCONFIG) $(@:_config=) ppc mpc83xx mpc8349itx + diff --git a/Makefile.85xx b/Makefile.85xx new file mode 100644 index 0000000..04f76a3 --- /dev/null +++ b/Makefile.85xx @@ -0,0 +1,86 @@ +MPC8540ADS_config: unconfig + @$(MKCONFIG) $(@:_config=) ppc mpc85xx mpc8540ads + +MPC8540EVAL_config \ +MPC8540EVAL_33_config \ +MPC8540EVAL_66_config \ +MPC8540EVAL_33_slave_config \ +MPC8540EVAL_66_slave_config: unconfig + @mkdir -p $(obj)include + @echo "" >$(obj)include/config.h ; \ + if [ "$(findstring _33_,$@)" ] ; then \ + echo -n "... 33 MHz PCI" ; \ + else \ + echo "#define CONFIG_SYSCLK_66M" >>$(obj)include/config.h ; \ + echo -n "... 66 MHz PCI" ; \ + fi ; \ + if [ "$(findstring _slave_,$@)" ] ; then \ + echo "#define CONFIG_PCI_SLAVE" >>$(obj)include/config.h ; \ + echo " slave" ; \ + else \ + echo " host" ; \ + fi + @$(MKCONFIG) -a MPC8540EVAL ppc mpc85xx mpc8540eval + +MPC8560ADS_config: unconfig + @$(MKCONFIG) $(@:_config=) ppc mpc85xx mpc8560ads + +MPC8541CDS_config: unconfig + @$(MKCONFIG) $(@:_config=) ppc mpc85xx mpc8541cds cds + +MPC8548CDS_config: unconfig + @$(MKCONFIG) $(@:_config=) ppc mpc85xx mpc8548cds cds + +MPC8555CDS_config: unconfig + @$(MKCONFIG) $(@:_config=) ppc mpc85xx mpc8555cds cds + +PM854_config: unconfig + @$(MKCONFIG) $(@:_config=) ppc mpc85xx pm854 + +PM856_config: unconfig + @$(MKCONFIG) $(@:_config=) ppc mpc85xx pm856 + +sbc8540_config \ +sbc8540_33_config \ +sbc8540_66_config: unconfig + @mkdir -p $(obj)include + @if [ "$(findstring _66_,$@)" ] ; then \ + echo "#define CONFIG_PCI_66" >>$(obj)include/config.h ; \ + echo "... 66 MHz PCI" ; \ + else \ + >$(obj)include/config.h ; \ + echo "... 33 MHz PCI" ; \ + fi + @$(MKCONFIG) -a SBC8540 ppc mpc85xx sbc8560 + +sbc8560_config \ +sbc8560_33_config \ +sbc8560_66_config: unconfig + @mkdir -p $(obj)include + @if [ "$(findstring _66_,$@)" ] ; then \ + echo "#define CONFIG_PCI_66" >>$(obj)include/config.h ; \ + echo "... 66 MHz PCI" ; \ + else \ + >$(obj)include/config.h ; \ + echo "... 33 MHz PCI" ; \ + fi + @$(MKCONFIG) -a sbc8560 ppc mpc85xx sbc8560 + +stxgp3_config: unconfig + @$(MKCONFIG) $(@:_config=) ppc mpc85xx stxgp3 + +TQM8540_config \ +TQM8541_config \ +TQM8555_config \ +TQM8560_config: unconfig + @mkdir -p $(obj)include + @CTYPE=$(subst TQM,,$(@:_config=)); \ + >$(obj)include/config.h ; \ + echo "... TQM"$${CTYPE}; \ + echo "#define CONFIG_MPC$${CTYPE}">>$(obj)include/config.h; \ + echo "#define CONFIG_TQM$${CTYPE}">>$(obj)include/config.h; \ + echo "#define CONFIG_HOSTNAME tqm$${CTYPE}">>$(obj)include/config.h; \ + echo "#define CONFIG_BOARDNAME "TQM$${CTYPE}"">>$(obj)include/config.h; \ + echo "#define CFG_BOOTFILE "bootfile=/tftpboot/tqm$${CTYPE}/uImage\0"">>$(obj)include/config.h + @$(MKCONFIG) -a TQM85xx ppc mpc85xx tqm85xx + diff --git a/Makefile.86xx b/Makefile.86xx new file mode 100644 index 0000000..cec5508 --- /dev/null +++ b/Makefile.86xx @@ -0,0 +1,3 @@ +MPC8641HPCN_config: unconfig + @./mkconfig $(@:_config=) ppc mpc86xx mpc8641hpcn +
In message 11698248351613-git-send-email-timur@freescale.com you wrote:
This patch moves the board configuration rules for 83xx, 85xx, and 86xx boards into their own makefiles. All 83xx boards are now configured in Makefile.83xx, all 85xx boards are in Makefile.85xx, and all 86xx boards are in Makefile.86xx. With separate maintainers for these families, this patch allows new boards to be added without having merge conflicts.
I reject this patch. The Makefile may be long, but I rather have all information in one place.
Your patch does not simplify anything, instead it just splits the same information over multiple files. That's IMHO not an improvement.
Best regards,
Wolfgang Denk
Wolfgang Denk wrote:
In message 11698248351613-git-send-email-timur@freescale.com you wrote:
This patch moves the board configuration rules for 83xx, 85xx, and 86xx boards into their own makefiles. All 83xx boards are now configured in Makefile.83xx, all 85xx boards are in Makefile.85xx, and all 86xx boards are in Makefile.86xx. With separate maintainers for these families, this patch allows new boards to be added without having merge conflicts.
I reject this patch. The Makefile may be long, but I rather have all information in one place.
Are you interested in any changes that divide the families into their own directories?
In message 45BA227E.2020509@freescale.com you wrote:
Are you interested in any changes that divide the families into their own directories?
But they are already devided - we have separate cpu/<family> directories for CPU specific stuff.
I don't think we should wrap the Makefile apart - I see only bigger complexity, and no advantages.
Your patch mentioned "avoid merge conflicts" - I don't see potential for such conflicts bbeacue the relevant parts of the Makefile are pretty good separated. On the othe rhand, you would have to split other files as well (MAKEALL, README, MAINTAINERS, ...)
Best regards,
Wolfgang Denk
participants (2)
-
Timur Tabi -
Wolfgang Denk