leandrof/u-boot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ppc4xx: Remove lcd4_lwmon5 support

Browse Source 
This platform has not gone into production. So lets remove it.

Signed-off-by: Stefan Roese <sr@denx.de>
Cc: Masahiro Yamada <yamada.masahiro@socionext.com>
This commit is contained in:
Stefan Roese 2015-10-02 08:20:37 +02:00 committed by Tom Rini
parent c0c7a55428
commit b6b5e394db
6 changed files with 1 additions and 80 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
arch/powerpc/cpu/ppc4xx/Kconfig
View File

@ -10,7 +10,6 @@ choice
config TARGET_LWMON5 config TARGET_LWMON5
bool "Support lwmon5" bool "Support lwmon5"
select SUPPORT_SPL
config TARGET_T3CORP config TARGET_T3CORP
bool "Support t3corp" bool "Support t3corp"

1
board/lwmon5/MAINTAINERS
View File

@ -3,5 +3,4 @@ M: Stefan Roese <sr@denx.de>
S: Maintained S: Maintained
F: board/lwmon5/ F: board/lwmon5/
F: include/configs/lwmon5.h F: include/configs/lwmon5.h
F: configs/lcd4_lwmon5_defconfig
F: configs/lwmon5_defconfig F: configs/lwmon5_defconfig

8
board/lwmon5/lwmon5.c
View File

@ -187,11 +187,9 @@ int misc_init_r(void)
u32 pbcr; u32 pbcr;
int size_val = 0; int size_val = 0;
u32 reg; u32 reg;
#ifndef CONFIG_LCD4_LWMON5
unsigned long usb2d0cr = 0; unsigned long usb2d0cr = 0;
unsigned long usb2phy0cr, usb2h0cr = 0; unsigned long usb2phy0cr, usb2h0cr = 0;
unsigned long sdr0_pfc1, sdr0_srst; unsigned long sdr0_pfc1, sdr0_srst;
#endif
/* /*
* FLASH stuff... * FLASH stuff...
@ -222,7 +220,6 @@ int misc_init_r(void)
CONFIG_ENV_ADDR_REDUND + 2 * CONFIG_ENV_SECT_SIZE - 1, CONFIG_ENV_ADDR_REDUND + 2 * CONFIG_ENV_SECT_SIZE - 1,
&flash_info[cfi_flash_num_flash_banks - 1]); &flash_info[cfi_flash_num_flash_banks - 1]);
#ifndef CONFIG_LCD4_LWMON5
/* /*
* USB suff... * USB suff...
*/ */
@ -296,7 +293,6 @@ int misc_init_r(void)
/* 7. Reassert internal PHY reset: */ /* 7. Reassert internal PHY reset: */
mtsdr(SDR0_SRST1, SDR0_SRST1_USB20PHY); mtsdr(SDR0_SRST1, SDR0_SRST1_USB20PHY);
udelay(1000); udelay(1000);
#endif
/* /*
* Clear resets * Clear resets
@ -304,9 +300,7 @@ int misc_init_r(void)
mtsdr(SDR0_SRST1, 0x00000000); mtsdr(SDR0_SRST1, 0x00000000);
mtsdr(SDR0_SRST0, 0x00000000); mtsdr(SDR0_SRST0, 0x00000000);
#ifndef CONFIG_LCD4_LWMON5
printf("USB: Host(int phy) Device(ext phy)\n"); printf("USB: Host(int phy) Device(ext phy)\n");
#endif
/* /*
* Clear PLB4A0_ACR[WRP] * Clear PLB4A0_ACR[WRP]
@ -316,12 +310,10 @@ int misc_init_r(void)
reg = mfdcr(PLB4A0_ACR) & ~PLB4Ax_ACR_WRP_MASK; reg = mfdcr(PLB4A0_ACR) & ~PLB4Ax_ACR_WRP_MASK;
mtdcr(PLB4A0_ACR, reg); mtdcr(PLB4A0_ACR, reg);
#ifndef CONFIG_LCD4_LWMON5
/* /*
* Init matrix keyboard * Init matrix keyboard
*/ */
misc_init_r_kbd(); misc_init_r_kbd();
#endif
return 0; return 0;
} }

2
board/lwmon5/sdram.c
View File

@ -147,7 +147,6 @@ static void program_ecc(u32 start_address,
************************************************************************/ ************************************************************************/
phys_size_t initdram (int board_type) phys_size_t initdram (int board_type)
{ {
#if defined(CONFIG_SPL_BUILD) || !defined(CONFIG_LCD4_LWMON5)
/* CL=4 */ /* CL=4 */
mtsdram(DDR0_02, 0x00000000); mtsdram(DDR0_02, 0x00000000);
@ -241,7 +240,6 @@ phys_size_t initdram (int board_type)
* exceptions are enabled. * exceptions are enabled.
*/ */
set_mcsr(get_mcsr()); set_mcsr(get_mcsr());
#endif /* CONFIG_SPL_BUILD */
return (CONFIG_SYS_MBYTES_SDRAM << 20); return (CONFIG_SYS_MBYTES_SDRAM << 20);
} }

6
configs/lcd4_lwmon5_defconfig
View File

@ -1,6 +0,0 @@
CONFIG_PPC=y
CONFIG_4xx=y
CONFIG_TARGET_LWMON5=y
CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="LCD4_LWMON5"
# CONFIG_CMD_SETEXPR is not set

63
include/configs/lwmon5.h
View File

@ -25,13 +25,8 @@
#define CONFIG_SYS_GENERIC_BOARD #define CONFIG_SYS_GENERIC_BOARD
#ifdef CONFIG_LCD4_LWMON5
#define CONFIG_SYS_TEXT_BASE 0x01000000 /* SPL U-Boot TEXT_BASE */
#define CONFIG_HOSTNAME lcd4_lwmon5
#else
#define CONFIG_SYS_TEXT_BASE 0xFFF80000 #define CONFIG_SYS_TEXT_BASE 0xFFF80000
#define CONFIG_HOSTNAME lwmon5 #define CONFIG_HOSTNAME lwmon5
#endif
#define CONFIG_SYS_CLK_FREQ 33300000 /* external freq to pll */ #define CONFIG_SYS_CLK_FREQ 33300000 /* external freq to pll */
@ -67,11 +62,9 @@
#define CONFIG_SYS_PCI_MEMBASE2 (CONFIG_SYS_PCI_MEMBASE1 + 0x10000000) #define CONFIG_SYS_PCI_MEMBASE2 (CONFIG_SYS_PCI_MEMBASE1 + 0x10000000)
#define CONFIG_SYS_PCI_MEMBASE3 (CONFIG_SYS_PCI_MEMBASE2 + 0x10000000) #define CONFIG_SYS_PCI_MEMBASE3 (CONFIG_SYS_PCI_MEMBASE2 + 0x10000000)
#ifndef CONFIG_LCD4_LWMON5
#define CONFIG_SYS_USB2D0_BASE 0xe0000100 #define CONFIG_SYS_USB2D0_BASE 0xe0000100
#define CONFIG_SYS_USB_DEVICE 0xe0000000 #define CONFIG_SYS_USB_DEVICE 0xe0000000
#define CONFIG_SYS_USB_HOST 0xe0000400 #define CONFIG_SYS_USB_HOST 0xe0000400
#endif
/* /*
* Initial RAM & stack pointer * Initial RAM & stack pointer
@ -81,20 +74,13 @@
* content during reset (GPT0_COMP6). This way we reserve the OCM (16k) * content during reset (GPT0_COMP6). This way we reserve the OCM (16k)
* for logbuffer only. (GPT0_COMP1-COMP5 are reserved for logbuffer header.) * for logbuffer only. (GPT0_COMP1-COMP5 are reserved for logbuffer header.)
*/ */
#ifndef CONFIG_LCD4_LWMON5
#define CONFIG_SYS_INIT_RAM_DCACHE 1 /* d-cache as init ram */ #define CONFIG_SYS_INIT_RAM_DCACHE 1 /* d-cache as init ram */
#define CONFIG_SYS_INIT_RAM_ADDR 0x70000000 /* DCache */ #define CONFIG_SYS_INIT_RAM_ADDR 0x70000000 /* DCache */
#define CONFIG_SYS_INIT_RAM_SIZE (4 << 10) #define CONFIG_SYS_INIT_RAM_SIZE (4 << 10)
#define CONFIG_SYS_GBL_DATA_OFFSET (CONFIG_SYS_INIT_RAM_SIZE - \ #define CONFIG_SYS_GBL_DATA_OFFSET (CONFIG_SYS_INIT_RAM_SIZE - \
GENERATED_GBL_DATA_SIZE) GENERATED_GBL_DATA_SIZE)
#define CONFIG_SYS_INIT_SP_OFFSET CONFIG_SYS_GBL_DATA_OFFSET #define CONFIG_SYS_INIT_SP_OFFSET CONFIG_SYS_GBL_DATA_OFFSET
#else
#define CONFIG_SYS_INIT_RAM_ADDR CONFIG_SYS_OCM_BASE
#define CONFIG_SYS_INIT_RAM_SIZE (4 << 10)
#define CONFIG_SYS_GBL_DATA_OFFSET (CONFIG_SYS_INIT_RAM_SIZE - \
GENERATED_GBL_DATA_SIZE)
#define CONFIG_SYS_INIT_SP_OFFSET (CONFIG_SYS_GBL_DATA_OFFSET - 0x4)
#endif
/* unused GPT0 COMP reg */ /* unused GPT0 COMP reg */
#define CONFIG_SYS_POST_WORD_ADDR (CONFIG_SYS_PERIPHERAL_BASE + GPT0_COMP6) #define CONFIG_SYS_POST_WORD_ADDR (CONFIG_SYS_PERIPHERAL_BASE + GPT0_COMP6)
#define CONFIG_SYS_OCM_SIZE (16 << 10) #define CONFIG_SYS_OCM_SIZE (16 << 10)
@ -168,11 +154,8 @@
#define CONFIG_SYS_MBYTES_SDRAM 256 #define CONFIG_SYS_MBYTES_SDRAM 256
#define CONFIG_SYS_DDR_CACHED_ADDR 0x40000000 /* setup 2nd TLB cached here */ #define CONFIG_SYS_DDR_CACHED_ADDR 0x40000000 /* setup 2nd TLB cached here */
#define CONFIG_DDR_DATA_EYE /* use DDR2 optimization */ #define CONFIG_DDR_DATA_EYE /* use DDR2 optimization */
#ifndef CONFIG_LCD4_LWMON5
#define CONFIG_DDR_ECC /* enable ECC */ #define CONFIG_DDR_ECC /* enable ECC */
#endif
#ifndef CONFIG_LCD4_LWMON5
/* POST support */ /* POST support */
#define CONFIG_POST (CONFIG_SYS_POST_CACHE | \ #define CONFIG_POST (CONFIG_SYS_POST_CACHE | \
CONFIG_SYS_POST_CPU | \ CONFIG_SYS_POST_CPU | \
@ -281,7 +264,6 @@
#define CONFIG_ALT_LH_ADDR (CONFIG_SYS_PERIPHERAL_BASE + GPT0_COMP1) #define CONFIG_ALT_LH_ADDR (CONFIG_SYS_PERIPHERAL_BASE + GPT0_COMP1)
#define CONFIG_ALT_LB_ADDR (CONFIG_SYS_OCM_BASE) #define CONFIG_ALT_LB_ADDR (CONFIG_SYS_OCM_BASE)
#define CONFIG_SYS_CONSOLE_IS_IN_ENV /* Otherwise it catches logbuffer as output */ #define CONFIG_SYS_CONSOLE_IS_IN_ENV /* Otherwise it catches logbuffer as output */
#endif
/* /*
* I2C * I2C
@ -401,7 +383,6 @@
#define CONFIG_VIDEO_SW_CURSOR #define CONFIG_VIDEO_SW_CURSOR
#define CONFIG_SPLASH_SCREEN #define CONFIG_SPLASH_SCREEN
#ifndef CONFIG_LCD4_LWMON5
/* /*
* USB/EHCI * USB/EHCI
*/ */
@ -417,7 +398,6 @@
#define CONFIG_MAC_PARTITION #define CONFIG_MAC_PARTITION
#define CONFIG_DOS_PARTITION #define CONFIG_DOS_PARTITION
#define CONFIG_ISO_PARTITION #define CONFIG_ISO_PARTITION
#endif
/* /*
* BOOTP options * BOOTP options
@ -448,11 +428,9 @@
#define CONFIG_CMD_BMP #define CONFIG_CMD_BMP
#endif #endif
#ifndef CONFIG_LCD4_LWMON5
#ifdef CONFIG_440EPX #ifdef CONFIG_440EPX
#define CONFIG_CMD_USB #define CONFIG_CMD_USB
#endif #endif
#endif
/* /*
* Miscellaneous configurable options * Miscellaneous configurable options
@ -485,13 +463,11 @@
#define CONFIG_SYS_CONSOLE_INFO_QUIET /* don't print console @ startup*/ #define CONFIG_SYS_CONSOLE_INFO_QUIET /* don't print console @ startup*/
#ifndef CONFIG_LCD4_LWMON5
#ifndef DEBUG #ifndef DEBUG
#define CONFIG_HW_WATCHDOG 1 /* Use external HW-Watchdog */ #define CONFIG_HW_WATCHDOG 1 /* Use external HW-Watchdog */
#endif #endif
#define CONFIG_WD_PERIOD 40000 /* in usec */ #define CONFIG_WD_PERIOD 40000 /* in usec */
#define CONFIG_WD_MAX_RATE 66600 /* in ticks */ #define CONFIG_WD_MAX_RATE 66600 /* in ticks */
#endif
/* /*
* For booting Linux, the board info and command line data * For booting Linux, the board info and command line data
@ -572,12 +548,7 @@
#define CONFIG_SYS_GPIO_SYSMON_STATUS 62 #define CONFIG_SYS_GPIO_SYSMON_STATUS 62
#define CONFIG_SYS_GPIO_WATCHDOG 63 #define CONFIG_SYS_GPIO_WATCHDOG 63
/* On LCD4, GPIO49 has to be configured to 0 instead of 1 */
#ifdef CONFIG_LCD4_LWMON5
#define GPIO49_VAL 0
#else
#define GPIO49_VAL 1 #define GPIO49_VAL 1
#endif
/* /*
* PPC440 GPIO Configuration * PPC440 GPIO Configuration
@ -659,36 +630,4 @@
#define CONFIG_KGDB_BAUDRATE 230400 /* speed to run kgdb serial port */ #define CONFIG_KGDB_BAUDRATE 230400 /* speed to run kgdb serial port */
#endif #endif
/*
* SPL related defines
*/
#ifdef CONFIG_LCD4_LWMON5
#define CONFIG_SPL_FRAMEWORK
#define CONFIG_SPL_BOARD_INIT
#define CONFIG_SPL_NOR_SUPPORT
#define CONFIG_SPL_TEXT_BASE 0xffff0000 /* last 64 KiB for SPL */
#define CONFIG_SYS_SPL_MAX_LEN (64 << 10)
#define CONFIG_UBOOT_PAD_TO 458752 /* decimal for 'dd' */
#define CONFIG_SPL_LIBCOMMON_SUPPORT /* image.c */
#define CONFIG_SPL_LIBGENERIC_SUPPORT /* string.c */
#define CONFIG_SPL_SERIAL_SUPPORT
/* Place BSS for SPL near end of SDRAM */
#define CONFIG_SPL_BSS_START_ADDR ((256 - 1) << 20)
#define CONFIG_SPL_BSS_MAX_SIZE (64 << 10)
#define CONFIG_SPL_OS_BOOT
/* Place patched DT blob (fdt) at this address */
#define CONFIG_SYS_SPL_ARGS_ADDR 0x01800000
#define CONFIG_SPL_TARGET "u-boot-img-spl-at-end.bin"
/* Settings for real U-Boot to be loaded from NOR flash */
#define CONFIG_SYS_UBOOT_BASE (-CONFIG_SYS_MONITOR_LEN)
#define CONFIG_SYS_UBOOT_START 0x01002100
#define CONFIG_SYS_OS_BASE 0xf8000000
#define CONFIG_SYS_FDT_BASE 0xf87c0000
#endif
#endif /* __CONFIG_H */ #endif /* __CONFIG_H */