projects
/
platform
/
kernel
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
powerpc: P4080DS: Remove macro CONFIG_P4080DS
[platform/kernel/u-boot.git]
/
include
/
configs
/
MPC8560ADS.h
diff --git
a/include/configs/MPC8560ADS.h
b/include/configs/MPC8560ADS.h
index
bb9ae2d
..
641521c
100644
(file)
--- a/
include/configs/MPC8560ADS.h
+++ b/
include/configs/MPC8560ADS.h
@@
-12,7
+12,7
@@
* Please refer to doc/README.mpc85xx for more info.
*
* Make sure you change the MAC address and other network params first,
* Please refer to doc/README.mpc85xx for more info.
*
* Make sure you change the MAC address and other network params first,
- * search for CONFIG_
ETHADDR, CONFIG_SERVERIP, etc
in this file.
+ * search for CONFIG_
SERVERIP, etc.
in this file.
*/
#ifndef __CONFIG_H
*/
#ifndef __CONFIG_H
@@
-21,10
+21,7
@@
/* High Level Configuration Options */
#define CONFIG_BOOKE 1 /* BOOKE */
#define CONFIG_E500 1 /* BOOKE e500 family */
/* High Level Configuration Options */
#define CONFIG_BOOKE 1 /* BOOKE */
#define CONFIG_E500 1 /* BOOKE e500 family */
-#define CONFIG_MPC85xx 1 /* MPC8540/MPC8560 */
#define CONFIG_CPM2 1 /* has CPM2 */
#define CONFIG_CPM2 1 /* has CPM2 */
-#define CONFIG_MPC8560ADS 1 /* MPC8560ADS board specific */
-#define CONFIG_MPC8560 1
/*
* default CCARBAR is at 0xff700000
/*
* default CCARBAR is at 0xff700000
@@
-32,7
+29,6
@@
*/
#define CONFIG_SYS_TEXT_BASE 0xfff80000
*/
#define CONFIG_SYS_TEXT_BASE 0xfff80000
-#define CONFIG_PCI
#define CONFIG_PCI_INDIRECT_BRIDGE
#define CONFIG_SYS_PCI_64BIT 1 /* enable 64-bit PCI resources */
#define CONFIG_TSEC_ENET /* tsec ethernet support */
#define CONFIG_PCI_INDIRECT_BRIDGE
#define CONFIG_SYS_PCI_64BIT 1 /* enable 64-bit PCI resources */
#define CONFIG_TSEC_ENET /* tsec ethernet support */
@@
-59,7
+55,6
@@
#define CONFIG_SYS_CLK_FREQ 33000000
#endif
#define CONFIG_SYS_CLK_FREQ 33000000
#endif
-
/*
* These can be toggled for performance analysis, otherwise use default.
*/
/*
* These can be toggled for performance analysis, otherwise use default.
*/
@@
-132,7
+127,6
@@
#undef CONFIG_CLOCKS_IN_MHZ
#undef CONFIG_CLOCKS_IN_MHZ
-
/*
* Local Bus Definitions
*/
/*
* Local Bus Definitions
*/
@@
-197,7
+191,6
@@
#define CONFIG_SYS_LBC_LSDMR_4 (CONFIG_SYS_LBC_LSDMR_COMMON | LSDMR_OP_MRW)
#define CONFIG_SYS_LBC_LSDMR_5 (CONFIG_SYS_LBC_LSDMR_COMMON | LSDMR_OP_NORMAL)
#define CONFIG_SYS_LBC_LSDMR_4 (CONFIG_SYS_LBC_LSDMR_COMMON | LSDMR_OP_MRW)
#define CONFIG_SYS_LBC_LSDMR_5 (CONFIG_SYS_LBC_LSDMR_COMMON | LSDMR_OP_NORMAL)
-
/*
* 32KB, 8-bit wide for ADS config reg
*/
/*
* 32KB, 8-bit wide for ADS config reg
*/
@@
-225,16
+218,6
@@
#define CONFIG_SYS_BAUDRATE_TABLE \
{300, 600, 1200, 2400, 4800, 9600, 19200, 38400,115200}
#define CONFIG_SYS_BAUDRATE_TABLE \
{300, 600, 1200, 2400, 4800, 9600, 19200, 38400,115200}
-/* Use the HUSH parser */
-#define CONFIG_SYS_HUSH_PARSER
-#ifdef CONFIG_SYS_HUSH_PARSER
-#endif
-
-/* pass open firmware flat tree */
-#define CONFIG_OF_LIBFDT 1
-#define CONFIG_OF_BOARD_SETUP 1
-#define CONFIG_OF_STDOUT_VIA_ALIAS 1
-
/*
* I2C
*/
/*
* I2C
*/
@@
-265,9
+248,6
@@
#define CONFIG_SYS_PCI1_IO_SIZE 0x100000 /* 1M */
#if defined(CONFIG_PCI)
#define CONFIG_SYS_PCI1_IO_SIZE 0x100000 /* 1M */
#if defined(CONFIG_PCI)
-
-#define CONFIG_PCI_PNP /* do pci plug-and-play */
-
#undef CONFIG_EEPRO100
#undef CONFIG_TULIP
#undef CONFIG_EEPRO100
#undef CONFIG_TULIP
@@
-282,7
+262,6
@@
#endif /* CONFIG_PCI */
#endif /* CONFIG_PCI */
-
#ifdef CONFIG_TSEC_ENET
#ifndef CONFIG_MII
#ifdef CONFIG_TSEC_ENET
#ifndef CONFIG_MII
@@
-354,7
+333,6
@@
#endif
#endif
-
/*
* Environment
*/
/*
* Environment
*/
@@
-381,17
+359,10
@@
#define CONFIG_BOOTP_GATEWAY
#define CONFIG_BOOTP_HOSTNAME
#define CONFIG_BOOTP_GATEWAY
#define CONFIG_BOOTP_HOSTNAME
-
/*
* Command line configuration.
*/
/*
* Command line configuration.
*/
-#include <config_cmd_default.h>
-
-#define CONFIG_CMD_PING
-#define CONFIG_CMD_I2C
-#define CONFIG_CMD_ELF
#define CONFIG_CMD_IRQ
#define CONFIG_CMD_IRQ
-#define CONFIG_CMD_SETEXPR
#define CONFIG_CMD_REGINFO
#if defined(CONFIG_PCI)
#define CONFIG_CMD_REGINFO
#if defined(CONFIG_PCI)
@@
-399,15
+370,8
@@
#endif
#if defined(CONFIG_ETHER_ON_FCC)
#endif
#if defined(CONFIG_ETHER_ON_FCC)
- #define CONFIG_CMD_MII
-#endif
-
-#if defined(CONFIG_SYS_RAMBOOT)
- #undef CONFIG_CMD_SAVEENV
- #undef CONFIG_CMD_LOADS
#endif
#endif
-
#undef CONFIG_WATCHDOG /* watchdog disabled */
/*
#undef CONFIG_WATCHDOG /* watchdog disabled */
/*
@@
-438,24
+402,16
@@
#if defined(CONFIG_CMD_KGDB)
#define CONFIG_KGDB_BAUDRATE 230400 /* speed to run kgdb serial port */
#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
#endif
-
/*
* Environment Configuration
*/
/*
* Environment Configuration
*/
-
-/* The mac addresses for all ethernet interface */
#if defined(CONFIG_TSEC_ENET) || defined(CONFIG_ETHER_ON_FCC)
#define CONFIG_HAS_ETH0
#if defined(CONFIG_TSEC_ENET) || defined(CONFIG_ETHER_ON_FCC)
#define CONFIG_HAS_ETH0
-#define CONFIG_ETHADDR 00:E0:0C:00:00:FD
#define CONFIG_HAS_ETH1
#define CONFIG_HAS_ETH1
-#define CONFIG_ETH1ADDR 00:E0:0C:00:01:FD
#define CONFIG_HAS_ETH2
#define CONFIG_HAS_ETH2
-#define CONFIG_ETH2ADDR 00:E0:0C:00:02:FD
#define CONFIG_HAS_ETH3
#define CONFIG_HAS_ETH3
-#define CONFIG_ETH3ADDR 00:E0:0C:00:03:FD
#endif
#define CONFIG_IPADDR 192.168.1.253
#endif
#define CONFIG_IPADDR 192.168.1.253
@@
-470,7
+426,6
@@
#define CONFIG_LOADADDR 200000 /* default location for tftp and bootm */
#define CONFIG_LOADADDR 200000 /* default location for tftp and bootm */
-#define CONFIG_BOOTDELAY 10 /* -1 disables auto-boot */
#undef CONFIG_BOOTARGS /* the boot command will set bootargs */
#define CONFIG_BAUDRATE 115200
#undef CONFIG_BOOTARGS /* the boot command will set bootargs */
#define CONFIG_BAUDRATE 115200