diff options
| author | Wolfgang Denk <wd@denx.de> | 2008-05-14 14:05:49 +0200 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2008-05-14 14:05:49 +0200 |
| commit | 35fca4c44d429ae6f2f4feae6dd4b30a72449906 (patch) | |
| tree | 64b2f9fdfcbad8d2c5eaf5b9a1a598ae5037c270 /board | |
| parent | cda2a4a9961fd4341b7db305cb22fc05957e8b77 (diff) | |
| parent | 2dd7082e06d580404010b06fe4e0e8b7038a00c8 (diff) | |
| download | talos-obmc-uboot-35fca4c44d429ae6f2f4feae6dd4b30a72449906.tar.gz talos-obmc-uboot-35fca4c44d429ae6f2f4feae6dd4b30a72449906.zip | |
Merge branch 'master' of git://www.denx.de/git/u-boot-ppc4xx
Diffstat (limited to 'board')
| -rw-r--r-- | board/amcc/canyonlands/config.mk | 8 | ||||
| -rw-r--r-- | board/amcc/kilauea/kilauea.c | 19 |
2 files changed, 12 insertions, 15 deletions
diff --git a/board/amcc/canyonlands/config.mk b/board/amcc/canyonlands/config.mk index 7e79536798..2330cae925 100644 --- a/board/amcc/canyonlands/config.mk +++ b/board/amcc/canyonlands/config.mk @@ -30,14 +30,6 @@ ifndef TEXT_BASE TEXT_BASE = 0xFFFA0000 endif -ifeq ($(CONFIG_NAND_U_BOOT),y) -LDSCRIPT = $(TOPDIR)/board/$(BOARDDIR)/u-boot-nand.lds -endif - -ifeq ($(CONFIG_PCIBOOT_U_BOOT),y) -LDSCRIPT = $(TOPDIR)/board/$(BOARDDIR)/u-boot-nand.lds -endif - PLATFORM_CPPFLAGS += -DCONFIG_440=1 ifeq ($(debug),1) diff --git a/board/amcc/kilauea/kilauea.c b/board/amcc/kilauea/kilauea.c index 37ef06ef2a..d806a412eb 100644 --- a/board/amcc/kilauea/kilauea.c +++ b/board/amcc/kilauea/kilauea.c @@ -230,14 +230,22 @@ int misc_init_r(void) return 0; } -int board_emac_count(void) +static int is_405exr(void) { u32 pvr = get_pvr(); + if (pvr & 0x00000004) + return 0; /* bit 2 set -> 405EX */ + + return 1; /* bit 2 cleared -> 405EXr */ +} + +int board_emac_count(void) +{ /* * 405EXr only has one EMAC interface, 405EX has two */ - if ((pvr == PVR_405EXR1_RA) || (pvr == PVR_405EXR2_RA)) + if (is_405exr()) return 1; else return 2; @@ -245,12 +253,10 @@ int board_emac_count(void) static int board_pcie_count(void) { - u32 pvr = get_pvr(); - /* * 405EXr only has one EMAC interface, 405EX has two */ - if ((pvr == PVR_405EXR1_RA) || (pvr == PVR_405EXR2_RA)) + if (is_405exr()) return 1; else return 2; @@ -259,9 +265,8 @@ static int board_pcie_count(void) int checkboard (void) { char *s = getenv("serial#"); - u32 pvr = get_pvr(); - if ((pvr == PVR_405EXR1_RA) || (pvr == PVR_405EXR2_RA)) + if (is_405exr()) printf("Board: Haleakala - AMCC PPC405EXr Evaluation Board"); else printf("Board: Kilauea - AMCC PPC405EX Evaluation Board"); |
