From 9813420e2dfc8e53601aa3bbd71a0d71773319e5 Mon Sep 17 00:00:00 2001 From: Stefan Roese Date: Tue, 21 Dec 2010 19:03:44 +0100 Subject: [PATCH 1/4] ppc4xx: Remove PCI support from lwmon5 PCI is not used at all on lwmon5. So lets remove it. It saves space and reduces boot time a bit (approx. 50ms). Signed-off-by: Stefan Roese --- include/configs/lwmon5.h | 17 ----------------- 1 file changed, 17 deletions(-) diff --git a/include/configs/lwmon5.h b/include/configs/lwmon5.h index aedf49510..a1ead70ee 100644 --- a/include/configs/lwmon5.h +++ b/include/configs/lwmon5.h @@ -440,7 +440,6 @@ #define CONFIG_CMD_MII #define CONFIG_CMD_NET #define CONFIG_CMD_NFS -#define CONFIG_CMD_PCI #define CONFIG_CMD_PING #define CONFIG_CMD_REGINFO #define CONFIG_CMD_SDRAM @@ -488,22 +487,6 @@ #define CONFIG_MX_CYCLIC 1 /* enable mdc/mwc commands */ #define CONFIG_VERSION_VARIABLE 1 /* include version env variable */ -/* - * PCI stuff - */ -/* General PCI */ -#define CONFIG_PCI /* include pci support */ -#undef CONFIG_PCI_PNP /* do (not) pci plug-and-play */ -#define CONFIG_PCI_SCAN_SHOW /* show pci devices on startup */ -#define CONFIG_SYS_PCI_TARGBASE 0x80000000 /* PCIaddr mapped to CONFIG_SYS_PCI_MEMBASE*/ - -/* Board-specific PCI */ -#define CONFIG_SYS_PCI_TARGET_INIT -#define CONFIG_SYS_PCI_MASTER_INIT - -#define CONFIG_SYS_PCI_SUBSYS_VENDORID 0x10e8 /* AMCC */ -#define CONFIG_SYS_PCI_SUBSYS_ID 0xcafe /* Whatever */ - #ifndef DEBUG #define CONFIG_HW_WATCHDOG 1 /* Use external HW-Watchdog */ #endif From da7d3dffacbd30942c8c63dc2cef5c1c7854cde5 Mon Sep 17 00:00:00 2001 From: Felix Radensky Date: Sun, 2 Jan 2011 11:07:34 +0200 Subject: [PATCH 2/4] PPC4xx: Reduce NAND TLB window size on Canyonlands 16MiB NAND TLB window is way too big. Reduce it to 1KiB. Signed-off-by: Felix Radensky Signed-off-by: Stefan Roese --- board/amcc/canyonlands/init.S | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/board/amcc/canyonlands/init.S b/board/amcc/canyonlands/init.S index 680feaa6a..8b7bfce63 100644 --- a/board/amcc/canyonlands/init.S +++ b/board/amcc/canyonlands/init.S @@ -80,7 +80,7 @@ tlbtab: #if !defined(CONFIG_ARCHES) /* TLB-entry for NAND */ - tlbentry(CONFIG_SYS_NAND_ADDR, SZ_16M, CONFIG_SYS_NAND_ADDR, 4, AC_RWX | SA_IG) + tlbentry(CONFIG_SYS_NAND_ADDR, SZ_1K, CONFIG_SYS_NAND_ADDR, 4, AC_RWX | SA_IG) /* TLB-entry for CPLD */ tlbentry(CONFIG_SYS_BCSR_BASE, SZ_1K, CONFIG_SYS_BCSR_BASE, 4, AC_RW | SA_IG) From c722c708ef8d51aecf2faf1e05a7f81d2005b3bb Mon Sep 17 00:00:00 2001 From: Stefan Roese Date: Mon, 10 Jan 2011 12:56:13 +0100 Subject: [PATCH 3/4] ppc4xx: Fix compilation breakage in miiphy.c Patch 8ef583a0 [miiphy: convert to linux/mii.h] introduced a small problem in the ppc4xx miiphy.c version. This patch fixes this problem. Signed-off-by: Stefan Roese Acked-by: Mike Frysinger --- arch/powerpc/cpu/ppc4xx/miiphy.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/powerpc/cpu/ppc4xx/miiphy.c b/arch/powerpc/cpu/ppc4xx/miiphy.c index 206c47664..9f8f8fa18 100644 --- a/arch/powerpc/cpu/ppc4xx/miiphy.c +++ b/arch/powerpc/cpu/ppc4xx/miiphy.c @@ -100,7 +100,7 @@ int phy_setup_aneg (char *devname, unsigned char addr) u16 anar = 0x0000; if (exsr & ESTATUS_1000XF) - anar |= ADVERTISE_1000XFULL); + anar |= ADVERTISE_1000XFULL; if (exsr & ESTATUS_1000XH) anar |= ADVERTISE_1000XHALF; From 7e4c3a41ce2e9ace8bbca125a81f7397ba91e536 Mon Sep 17 00:00:00 2001 From: Ricardo Ribalda Delgado Date: Fri, 24 Dec 2010 01:38:10 +0100 Subject: [PATCH 4/4] xilinx-ppc4xx-generic: Fix Makefile to work with MAKEALL config.mk only mkdirs $(obj), but we have objects shared with other boards located on other dirs. This patch mkdirs the needed dirs for the xlnx-generic boards. Signed-off-by: Stefan Roese --- board/xilinx/ppc405-generic/Makefile | 11 +++-------- board/xilinx/ppc440-generic/Makefile | 14 ++++---------- 2 files changed, 7 insertions(+), 18 deletions(-) diff --git a/board/xilinx/ppc405-generic/Makefile b/board/xilinx/ppc405-generic/Makefile index 717ffc9c9..501fd467e 100644 --- a/board/xilinx/ppc405-generic/Makefile +++ b/board/xilinx/ppc405-generic/Makefile @@ -27,12 +27,9 @@ include $(TOPDIR)/config.mk ifneq ($(OBJTREE),$(SRCTREE)) +$(shell mkdir -p $(obj)../../xilinx/ppc405-generic) endif -INCS := -CFLAGS += $(INCS) -HOSTCFLAGS += $(INCS) - LIB = $(obj)lib$(BOARD).o COBJS += ../../xilinx/ppc405-generic/xilinx_ppc405_generic.o @@ -41,10 +38,8 @@ SRCS := $(SOBJS:.o=.S) $(COBJS:.o=.c) OBJS := $(addprefix $(obj),$(COBJS)) SOBJS := $(addprefix $(obj),$(SOBJS)) -all: $(LIB) $(SOBJS) - -$(LIB): $(OBJS) - $(call cmd_link_o_target, $^) +$(LIB): $(obj).depend $(OBJS) $(SOBJS) + $(call cmd_link_o_target, $(OBJS)) clean: rm -f $(SOBJS) $(OBJS) diff --git a/board/xilinx/ppc440-generic/Makefile b/board/xilinx/ppc440-generic/Makefile index 1760e4e3b..ed2cf9f43 100644 --- a/board/xilinx/ppc440-generic/Makefile +++ b/board/xilinx/ppc440-generic/Makefile @@ -27,26 +27,20 @@ include $(TOPDIR)/config.mk ifneq ($(OBJTREE),$(SRCTREE)) +$(shell mkdir -p $(obj)../../xilinx/ppc440-generic) endif -INCS := -CFLAGS += $(INCS) -HOSTCFLAGS += $(INCS) - LIB = $(obj)lib$(BOARD).o COBJS += ../../xilinx/ppc440-generic/xilinx_ppc440_generic.o - -SOBJS += ../../xilinx/ppc440-generic/init.o +SOBJS += ../../xilinx/ppc440-generic/init.o SRCS := $(SOBJS:.o=.S) $(COBJS:.o=.c) OBJS := $(addprefix $(obj),$(COBJS)) SOBJS := $(addprefix $(obj),$(SOBJS)) -all: $(LIB) $(SOBJS) - -$(LIB): $(OBJS) - $(call cmd_link_o_target, $^) +$(LIB): $(obj).depend $(OBJS) $(SOBJS) + $(call cmd_link_o_target, $(OBJS)) clean: rm -f $(SOBJS) $(OBJS)