minix/u-boot
1
0
Fork 0
mirror of https://github.com/Stichting-MINIX-Research-Foundation/u-boot.git synced 2025-08-24 14:16:17 -04:00
Code Issues Packages Projects Releases Wiki Activity

Rename ads5121 board into mpc5121ads

Browse Source 
We rename the board so we use a consistent name in U-Boot and in
Linux.  Also, we use this opportunity to move the board into the
Freecale vendor directory.

Signed-off-by: Wolfgang Denk <wd@denx.de>
Cc: John Rigby <jcrigby@gmail.com>
This commit is contained in:
Wolfgang Denk 2009-05-16 10:47:41 +02:00
parent debf874155
commit 72601d04fd
7 changed files with 25 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
MAKEALL
View File

@ -77,7 +77,7 @@ LIST_5xxx=" \
######################################################################### #########################################################################
LIST_512x=" \ LIST_512x=" \
ads5121 \ mpc5121ads \
" "
######################################################################### #########################################################################

6
Makefile
View File

@ -821,14 +821,14 @@ v38b_config: unconfig
## MPC512x Systems ## MPC512x Systems
######################################################################### #########################################################################
ads5121_config \ mpc5121ads_config \
ads5121_rev2_config \ mpc5121ads_rev2_config \
: unconfig : unconfig
@mkdir -p $(obj)include @mkdir -p $(obj)include
@if [ "$(findstring rev2,$@)" ] ; then \ @if [ "$(findstring rev2,$@)" ] ; then \
echo "#define CONFIG_ADS5121_REV2 1" > $(obj)include/config.h; \ echo "#define CONFIG_ADS5121_REV2 1" > $(obj)include/config.h; \
fi fi
@$(MKCONFIG) -a ads5121 ppc mpc512x ads5121 @$(MKCONFIG) -a mpc5121ads ppc mpc512x mpc5121ads freescale
######################################################################### #########################################################################

0
board/ads5121/Makefile → board/freescale/mpc5121ads/Makefile
View File

0
board/ads5121/README → board/freescale/mpc5121ads/README
View File

0
board/ads5121/config.mk → board/freescale/mpc5121ads/config.mk
View File

17
board/ads5121/ads5121.c → board/freescale/mpc5121ads/mpc5121ads.c
View File

@ -33,6 +33,8 @@
DECLARE_GLOBAL_DATA_PTR; DECLARE_GLOBAL_DATA_PTR;
extern int mpc5121_diu_init(void);
/* Clocks in use */ /* Clocks in use */
#define SCCR1_CLOCKS_EN (CLOCK_SCCR1_CFG_EN | \ #define SCCR1_CLOCKS_EN (CLOCK_SCCR1_CFG_EN | \
CLOCK_SCCR1_LPC_EN | \ CLOCK_SCCR1_LPC_EN | \
@ -216,7 +218,6 @@ long int fixed_sdram (void)
int misc_init_r(void) int misc_init_r(void)
{ {
u8 tmp_val; u8 tmp_val;
extern int mpc5121_diu_init(void);
/* Using this for DIU init before the driver in linux takes over /* Using this for DIU init before the driver in linux takes over
* Enable the TFP410 Encoder (I2C address 0x38) * Enable the TFP410 Encoder (I2C address 0x38)
@ -238,13 +239,13 @@ int misc_init_r(void)
debug("DVI Encoder Read: 0x%02lx\n", tmp_val); debug("DVI Encoder Read: 0x%02lx\n", tmp_val);
#ifdef CONFIG_FSL_DIU_FB #ifdef CONFIG_FSL_DIU_FB
#if !(defined(CONFIG_VIDEO) || defined(CONFIG_CFB_CONSOLE)) # if !(defined(CONFIG_VIDEO) || defined(CONFIG_CFB_CONSOLE))
mpc5121_diu_init(); mpc5121_diu_init();
# endif
#endif #endif
#endif
return 0; return 0;
} }
static iopin_t ioregs_init[] = { static iopin_t ioregs_init[] = {
/* FUNC1=FEC_RX_DV Sets Next 3 to FEC pads */ /* FUNC1=FEC_RX_DV Sets Next 3 to FEC pads */
{ {
@ -312,12 +313,12 @@ int checkboard (void)
printf ("Board: ADS5121 rev. 0x%04x (CPLD rev. 0x%02x)\n", printf ("Board: ADS5121 rev. 0x%04x (CPLD rev. 0x%02x)\n",
brd_rev, cpld_rev); brd_rev, cpld_rev);
/* initialize function mux & slew rate IO inter alia on IO Pins */
iopin_initialize(ioregs_init, sizeof(ioregs_init) / sizeof(ioregs_init[0])); /* initialize function mux & slew rate IO inter alia on IO Pins */
if (SVR_MJREV (im->sysconf.spridr) >= 2) { iopin_initialize(ioregs_init, ARRAY_SIZE(ioregs_init));
if (SVR_MJREV (im->sysconf.spridr) >= 2)
iopin_initialize(rev2_silicon_pci_ioregs_init, 1); iopin_initialize(rev2_silicon_pci_ioregs_init, 1);
}
return 0; return 0;
} }

24
include/configs/ads5121.h → include/configs/mpc5121ads.h
View File

@ -21,15 +21,15 @@
*/ */
/* /*
* ADS5121 board configuration file * MPC5121ADS board configuration file
*/ */
#ifndef __CONFIG_H #ifndef __CONFIG_H
#define __CONFIG_H #define __CONFIG_H
#define CONFIG_ADS5121 1 #define CONFIG_MPC5121ADS 1
/* /*
* Memory map for the ADS5121 board: * Memory map for the MPC5121ADS board:
* *
* 0x0000_0000 - 0x0FFF_FFFF DDR RAM (256 MB) * 0x0000_0000 - 0x0FFF_FFFF DDR RAM (256 MB)
* 0x3000_0000 - 0x3001_FFFF SRAM (128 KB) * 0x3000_0000 - 0x3001_FFFF SRAM (128 KB)
@ -59,7 +59,7 @@
/* CONFIG_PCI is defined at config time */ /* CONFIG_PCI is defined at config time */
#ifdef CONFIG_ADS5121_REV2 #ifdef CONFIG_MPC5121ADS_REV2
#define CONFIG_SYS_MPC512X_CLKIN 66000000 /* in Hz */ #define CONFIG_SYS_MPC512X_CLKIN 66000000 /* in Hz */
#else #else
#define CONFIG_SYS_MPC512X_CLKIN 33333333 /* in Hz */ #define CONFIG_SYS_MPC512X_CLKIN 33333333 /* in Hz */
@ -78,7 +78,7 @@
/* /*
* DDR Setup - manually set all parameters as there's no SPD etc. * DDR Setup - manually set all parameters as there's no SPD etc.
*/ */
#ifdef CONFIG_ADS5121_REV2 #ifdef CONFIG_MPC5121ADS_REV2
#define CONFIG_SYS_DDR_SIZE 256 /* MB */ #define CONFIG_SYS_DDR_SIZE 256 /* MB */
#else #else
#define CONFIG_SYS_DDR_SIZE 512 /* MB */ #define CONFIG_SYS_DDR_SIZE 512 /* MB */
@ -130,7 +130,7 @@
* [09:05] DRAM tRP: * [09:05] DRAM tRP:
* [04:00] DRAM tRPA * [04:00] DRAM tRPA
*/ */
#ifdef CONFIG_ADS5121_REV2 #ifdef CONFIG_MPC5121ADS_REV2
#define CONFIG_SYS_MDDRC_SYS_CFG 0xF8604A00 #define CONFIG_SYS_MDDRC_SYS_CFG 0xF8604A00
#define CONFIG_SYS_MDDRC_SYS_CFG_RUN 0xE8604A00 #define CONFIG_SYS_MDDRC_SYS_CFG_RUN 0xE8604A00
#define CONFIG_SYS_MDDRC_TIME_CFG1 0x54EC1168 #define CONFIG_SYS_MDDRC_TIME_CFG1 0x54EC1168
@ -433,8 +433,8 @@
*/ */
#define CONFIG_TIMESTAMP #define CONFIG_TIMESTAMP
#define CONFIG_HOSTNAME ads5121 #define CONFIG_HOSTNAME mpc5121ads
#define CONFIG_BOOTFILE ads5121/uImage #define CONFIG_BOOTFILE mpc5121ads/uImage
#define CONFIG_ROOTPATH /opt/eldk/ppc_6xx #define CONFIG_ROOTPATH /opt/eldk/ppc_6xx
#define CONFIG_LOADADDR 400000 /* default location for tftp and bootm */ #define CONFIG_LOADADDR 400000 /* default location for tftp and bootm */
@ -457,10 +457,10 @@
"kernel_addr=FFC40000\0" \ "kernel_addr=FFC40000\0" \
"fdt_addr=FFEC0000\0" \ "fdt_addr=FFEC0000\0" \
"ramdisk_addr=FC040000\0" \ "ramdisk_addr=FC040000\0" \
"ramdiskfile=ads5121/uRamdisk\0" \ "ramdiskfile=mpc5121ads/uRamdisk\0" \
"u-boot=ads5121/u-boot.bin\0" \ "u-boot=mpc5121ads/u-boot.bin\0" \
"bootfile=ads5121/uImage\0" \ "bootfile=mpc5121ads/uImage\0" \
"fdtfile=ads5121/ads5121.dtb\0" \ "fdtfile=mpc5121ads/mpc5121ads.dtb\0" \
"rootpath=/opt/eldk/ppc_6xx\n" \ "rootpath=/opt/eldk/ppc_6xx\n" \
"netdev=eth0\0" \ "netdev=eth0\0" \
"consdev=ttyPSC0\0" \ "consdev=ttyPSC0\0" \