GitHub-Mirror/u-boot
2
0
Fork 0
mirror of https://github.com/Fishwaldo/u-boot.git synced 2025-03-21 06:31:31 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix boards broken after removal of legacy NAND and DoC support

Browse source 
Commit 2419169f removed support for legacy NAND and disk on chip but
missed to update the code for a few boards. This patch fixes the
resulting build issues.

Signed-off-by: Wolfgang Denk <wd@denx.de>
This commit is contained in:
Wolfgang Denk 2009-07-19 19:37:24 +02:00
parent 1a4664b53a
commit 7640f41988
7 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
board/bmw/bmw.c
View file

@ -117,6 +117,7 @@ sys_led_msg(char* msg)
LED_REG(3) = msg[0]; LED_REG(3) = msg[0];
} }
#ifdef CONFIG_CMD_DOC
/* /*
* Map onboard TSOP-16MB DOC FLASH chip. * Map onboard TSOP-16MB DOC FLASH chip.
*/ */
@ -124,6 +125,7 @@ void doc_init (void)
{ {
doc_probe(DOC_BASE_ADDR); doc_probe(DOC_BASE_ADDR);
} }
#endif
#define NV_ADDR ((volatile unsigned char *) CONFIG_ENV_ADDR) #define NV_ADDR ((volatile unsigned char *) CONFIG_ENV_ADDR)

2
board/pcippc2/pcippc2.c
View file

@ -147,10 +147,12 @@ void pci_init_board (void)
cpc710_pci_enable_timeout (); cpc710_pci_enable_timeout ();
} }
#ifdef CONFIG_CMD_DOC
void doc_init (void) void doc_init (void)
{ {
doc_probe (pcippc2_fpga1_phys + HW_FPGA1_DOC); doc_probe (pcippc2_fpga1_phys + HW_FPGA1_DOC);
} }
#endif
void pcippc2_cpci3264_init (void) void pcippc2_cpci3264_init (void)
{ {

2
board/rbc823/rbc823.c
View file

@ -256,6 +256,7 @@ static long int dram_size (long int mamr_value, long int *base,
return (get_ram_size (base, maxsize)); return (get_ram_size (base, maxsize));
} }
#ifdef CONFIG_CMD_DOC
void doc_init (void) void doc_init (void)
{ {
volatile immap_t *immap = (immap_t *) CONFIG_SYS_IMMR; volatile immap_t *immap = (immap_t *) CONFIG_SYS_IMMR;
@ -267,3 +268,4 @@ void doc_init (void)
doc_probe (FLASH_BASE1_PRELIM); doc_probe (FLASH_BASE1_PRELIM);
} }
#endif

1
include/configs/NETPHONE.h
View file

@ -120,7 +120,6 @@
*/ */
#include <config_cmd_default.h> #include <config_cmd_default.h>
#define CONFIG_CMD_NAND
#define CONFIG_CMD_DHCP #define CONFIG_CMD_DHCP
#define CONFIG_CMD_PING #define CONFIG_CMD_PING
#define CONFIG_CMD_MII #define CONFIG_CMD_MII

1
include/configs/NETTA.h
View file

@ -134,7 +134,6 @@
#define CONFIG_CMD_IDE #define CONFIG_CMD_IDE
#define CONFIG_CMD_JFFS2 #define CONFIG_CMD_JFFS2
#define CONFIG_CMD_MII #define CONFIG_CMD_MII
#define CONFIG_CMD_NAND
#define CONFIG_CMD_NFS #define CONFIG_CMD_NFS
#define CONFIG_CMD_PCMCIA #define CONFIG_CMD_PCMCIA
#define CONFIG_CMD_PING #define CONFIG_CMD_PING

1
include/configs/NETTA2.h
View file

@ -121,7 +121,6 @@
*/ */
#include <config_cmd_default.h> #include <config_cmd_default.h>
#define CONFIG_CMD_NAND
#define CONFIG_CMD_DHCP #define CONFIG_CMD_DHCP
#define CONFIG_CMD_PING #define CONFIG_CMD_PING
#define CONFIG_CMD_MII #define CONFIG_CMD_MII

2
include/configs/NETVIA.h
View file

@ -107,7 +107,7 @@
#define CONFIG_CMD_PING #define CONFIG_CMD_PING
#if defined(CONFIG_NETVIA_VERSION) && CONFIG_NETVIA_VERSION >= 2 #if defined(CONFIG_NETVIA_VERSION) && CONFIG_NETVIA_VERSION >= 2
#define CONFIG_CMD_NAND /* #define CONFIG_CMD_NAND */ /* disabled */
#endif #endif