Mirrors/u-boot
2
0
Fork 0
mirror of https://github.com/AsahiLinux/u-boot synced 2024-11-28 15:41:40 +00:00
Code Issues Projects Releases Packages Wiki Activity

sbc85x0: tidy up Makefile to use new configuration script.

Browse source 
Commit 804d83a5 allows us to move all the configuration
variation tweaks out of the top level Makefile and down
into the boards config header.  This takes advantage of
that for the sbc8540/sbc8560 boards.

There were a couple of cheezy comments pointing at incorrect
files, or files that don't exist, so I've cleaned those up too.

Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
This commit is contained in:
Paul Gortmaker 2009-09-21 17:19:17 -04:00 committed by Kumar Gala
parent 2738bc8df6
commit 928435d11b
3 changed files with 25 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
Makefile
View file

@ -2535,14 +2535,7 @@ PM856_config: unconfig
sbc8540_config \ sbc8540_config \
sbc8540_33_config \ sbc8540_33_config \
sbc8540_66_config: unconfig sbc8540_66_config: unconfig
@mkdir -p $(obj)include @$(MKCONFIG) -t $(@:_config=) SBC8540 ppc mpc85xx sbc8560
@if [ "$(findstring _66_,$@)" ] ; then \
echo "#define CONFIG_PCI_66" >>$(obj)include/config.h ; \
$(XECHO) "... 66 MHz PCI" ; \
else \
$(XECHO) "... 33 MHz PCI" ; \
fi
@$(MKCONFIG) -a SBC8540 ppc mpc85xx sbc8560
sbc8548_config \ sbc8548_config \
sbc8548_PCI_33_config \ sbc8548_PCI_33_config \
@ -2554,14 +2547,7 @@ sbc8548_PCI_66_PCIE_config: unconfig
sbc8560_config \ sbc8560_config \
sbc8560_33_config \ sbc8560_33_config \
sbc8560_66_config: unconfig sbc8560_66_config: unconfig
@mkdir -p $(obj)include @$(MKCONFIG) -t $(@:_config=) sbc8560 ppc mpc85xx sbc8560
@if [ "$(findstring _66_,$@)" ] ; then \
echo "#define CONFIG_PCI_66" >>$(obj)include/config.h ; \
$(XECHO) "... 66 MHz PCI" ; \
else \
$(XECHO) "... 33 MHz PCI" ; \
fi
@$(MKCONFIG) -a sbc8560 ppc mpc85xx sbc8560
socrates_config: unconfig socrates_config: unconfig
@$(MKCONFIG) $(@:_config=) ppc mpc85xx socrates @$(MKCONFIG) $(@:_config=) ppc mpc85xx socrates

19
include/configs/SBC8540.h
View file

@ -24,22 +24,25 @@
* MA 02111-1307 USA * MA 02111-1307 USA
*/ */
/* mpc8560ads board configuration file */ /*
/* please refer to doc/README.mpc85xx for more info */ * sbc8540 board configuration file.
/* make sure you change the MAC address and other network params first,
* search for CONFIG_ETHADDR,CONFIG_SERVERIP,etc in this file
*/ */
#ifndef __CONFIG_H #ifndef __CONFIG_H
#define __CONFIG_H #define __CONFIG_H
#if XXX /*
#define DEBUG /* General debug */ * Top level Makefile configuration choices
#define ET_DEBUG */
#ifdef CONFIG_MK_66
#define CONFIG_PCI_66
#endif #endif
#define TSEC_DEBUG #define TSEC_DEBUG
/* High Level Configuration Options */ /*
* High Level Configuration Options
*/
#define CONFIG_BOOKE 1 /* BOOKE */ #define CONFIG_BOOKE 1 /* BOOKE */
#define CONFIG_E500 1 /* BOOKE e500 family */ #define CONFIG_E500 1 /* BOOKE e500 family */
#define CONFIG_MPC85xx 1 /* MPC8540/MPC8560 */ #define CONFIG_MPC85xx 1 /* MPC8540/MPC8560 */

17
include/configs/sbc8560.h
View file

@ -24,16 +24,23 @@
* MA 02111-1307 USA * MA 02111-1307 USA
*/ */
/* sbc8560 board configuration file */ /*
/* please refer to doc/README.sbc8560 for more info */ * sbc8560 board configuration file.
/* make sure you change the MAC address and other network params first,
* search for CONFIG_ETHADDR,CONFIG_SERVERIP,etc in this file
*/ */
#ifndef __CONFIG_H #ifndef __CONFIG_H
#define __CONFIG_H #define __CONFIG_H
/* High Level Configuration Options */ /*
* Top level Makefile configuration choices
*/
#ifdef CONFIG_MK_66
#define CONFIG_PCI_66
#endif
/*
* High Level Configuration Options
*/
#define CONFIG_BOOKE 1 /* BOOKE */ #define CONFIG_BOOKE 1 /* BOOKE */
#define CONFIG_E500 1 /* BOOKE e500 family */ #define CONFIG_E500 1 /* BOOKE e500 family */
#define CONFIG_MPC85xx 1 /* MPC8540/MPC8560 */ #define CONFIG_MPC85xx 1 /* MPC8540/MPC8560 */