From 8662577fe36fdb6a44b55b998d9daac6392a736a Mon Sep 17 00:00:00 2001 From: Jon Loeliger Date: Wed, 15 Aug 2007 11:46:22 -0500 Subject: [PATCH 1/2] 86xx: Fix lingering CFG_CMD_* references in sbc8641d.h Remove a leftover in net/tftp.c while we're at it. Signed-off-by: Jon Loeliger --- include/configs/sbc8641d.h | 6 +++--- net/tftp.c | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/include/configs/sbc8641d.h b/include/configs/sbc8641d.h index 68d31ca1db..277b611409 100644 --- a/include/configs/sbc8641d.h +++ b/include/configs/sbc8641d.h @@ -492,7 +492,7 @@ #define CFG_LOAD_ADDR 0x2000000 /* default load address */ #define CFG_PROMPT "=> " /* Monitor Command Prompt */ -#if (CONFIG_COMMANDS & CFG_CMD_KGDB) +#if defined(CONFIG_CMD_KGDB) #define CFG_CBSIZE 1024 /* Console I/O Buffer Size */ #else #define CFG_CBSIZE 256 /* Console I/O Buffer Size */ @@ -513,7 +513,7 @@ /* Cache Configuration */ #define CFG_DCACHE_SIZE 32768 #define CFG_CACHELINE_SIZE 32 -#if (CONFIG_COMMANDS & CFG_CMD_KGDB) +#if defined(CONFIG_CMD_KGDB) #define CFG_CACHELINE_SHIFT 5 /*log base 2 of the above value*/ #endif @@ -525,7 +525,7 @@ #define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ #define BOOTFLAG_WARM 0x02 /* Software reboot */ -#if (CONFIG_COMMANDS & CFG_CMD_KGDB) +#if defined(CONFIG_CMD_KGDB) #define CONFIG_KGDB_BAUDRATE 230400 /* speed to run kgdb serial port */ #define CONFIG_KGDB_SER_INDEX 2 /* which serial port to use */ #endif diff --git a/net/tftp.c b/net/tftp.c index 888ec987cf..d6db91c058 100644 --- a/net/tftp.c +++ b/net/tftp.c @@ -614,4 +614,4 @@ static void parse_multicast_oack(char *pkt, int len) #endif /* Multicast TFTP */ -#endif /* CFG_CMD_NET */ +#endif From 4ce917742b1e48faa9bf9a9757545e56fb4cfe44 Mon Sep 17 00:00:00 2001 From: Jon Loeliger Date: Wed, 15 Aug 2007 12:20:40 -0500 Subject: [PATCH 2/2] Move the MPC8641HPCN board under board/freescale. Minor path corrections needed to ensure buildability. Signed-off-by: Jon Loeliger --- Makefile | 2 +- board/{mpc8641hpcn => freescale/common}/sys_eeprom.c | 0 board/{ => freescale}/mpc8641hpcn/Makefile | 7 ++++--- board/{ => freescale}/mpc8641hpcn/config.mk | 0 board/{ => freescale}/mpc8641hpcn/init.S | 0 board/{ => freescale}/mpc8641hpcn/mpc8641hpcn.c | 2 +- board/{ => freescale}/mpc8641hpcn/u-boot.lds | 2 +- 7 files changed, 7 insertions(+), 6 deletions(-) rename board/{mpc8641hpcn => freescale/common}/sys_eeprom.c (100%) rename board/{ => freescale}/mpc8641hpcn/Makefile (93%) rename board/{ => freescale}/mpc8641hpcn/config.mk (100%) rename board/{ => freescale}/mpc8641hpcn/init.S (100%) rename board/{ => freescale}/mpc8641hpcn/mpc8641hpcn.c (99%) rename board/{ => freescale}/mpc8641hpcn/u-boot.lds (98%) diff --git a/Makefile b/Makefile index 9dee9483c6..65efd3f5e0 100644 --- a/Makefile +++ b/Makefile @@ -1900,7 +1900,7 @@ TQM8560_config: unconfig ######################################################################### MPC8641HPCN_config: unconfig - @$(MKCONFIG) $(@:_config=) ppc mpc86xx mpc8641hpcn + @$(MKCONFIG) $(@:_config=) ppc mpc86xx mpc8641hpcn freescale sbc8641d_config: unconfig @./mkconfig $(@:_config=) ppc mpc86xx sbc8641d diff --git a/board/mpc8641hpcn/sys_eeprom.c b/board/freescale/common/sys_eeprom.c similarity index 100% rename from board/mpc8641hpcn/sys_eeprom.c rename to board/freescale/common/sys_eeprom.c diff --git a/board/mpc8641hpcn/Makefile b/board/freescale/mpc8641hpcn/Makefile similarity index 93% rename from board/mpc8641hpcn/Makefile rename to board/freescale/mpc8641hpcn/Makefile index df56b31e58..93b015d474 100644 --- a/board/mpc8641hpcn/Makefile +++ b/board/freescale/mpc8641hpcn/Makefile @@ -24,13 +24,14 @@ include $(TOPDIR)/config.mk ifneq ($(OBJTREE),$(SRCTREE)) -$(shell mkdir -p $(obj)../freescale/common) +$(shell mkdir -p $(obj)../common) endif LIB = $(obj)lib$(BOARD).a -COBJS := $(BOARD).o sys_eeprom.o \ - ../freescale/common/pixis.o +COBJS := $(BOARD).o \ + ../common/sys_eeprom.o \ + ../common/pixis.o SOBJS := init.o diff --git a/board/mpc8641hpcn/config.mk b/board/freescale/mpc8641hpcn/config.mk similarity index 100% rename from board/mpc8641hpcn/config.mk rename to board/freescale/mpc8641hpcn/config.mk diff --git a/board/mpc8641hpcn/init.S b/board/freescale/mpc8641hpcn/init.S similarity index 100% rename from board/mpc8641hpcn/init.S rename to board/freescale/mpc8641hpcn/init.S diff --git a/board/mpc8641hpcn/mpc8641hpcn.c b/board/freescale/mpc8641hpcn/mpc8641hpcn.c similarity index 99% rename from board/mpc8641hpcn/mpc8641hpcn.c rename to board/freescale/mpc8641hpcn/mpc8641hpcn.c index 1bfbe88b5a..ffd11cb5f1 100644 --- a/board/mpc8641hpcn/mpc8641hpcn.c +++ b/board/freescale/mpc8641hpcn/mpc8641hpcn.c @@ -33,7 +33,7 @@ extern void ft_cpu_setup(void *blob, bd_t *bd); #endif -#include "../freescale/common/pixis.h" +#include "../common/pixis.h" #if defined(CONFIG_DDR_ECC) && !defined(CONFIG_ECC_INIT_VIA_DDRCONTROLLER) extern void ddr_enable_ecc(unsigned int dram_size); diff --git a/board/mpc8641hpcn/u-boot.lds b/board/freescale/mpc8641hpcn/u-boot.lds similarity index 98% rename from board/mpc8641hpcn/u-boot.lds rename to board/freescale/mpc8641hpcn/u-boot.lds index 58644648c7..fd163622a8 100644 --- a/board/mpc8641hpcn/u-boot.lds +++ b/board/freescale/mpc8641hpcn/u-boot.lds @@ -51,7 +51,7 @@ SECTIONS .text : { cpu/mpc86xx/start.o (.text) - board/mpc8641hpcn/init.o (.bootpg) + board/freescale/mpc8641hpcn/init.o (.bootpg) cpu/mpc86xx/traps.o (.text) cpu/mpc86xx/interrupts.o (.text) cpu/mpc86xx/cpu_init.o (.text)