summaryrefslogtreecommitdiffstats
path: root/board/mpc8641hpcn
diff options
context:
space:
mode:
authorJon Loeliger <jdl@freescale.com>2006-05-09 08:23:49 -0500
committerJon Loeliger <jdl@freescale.com>2006-05-09 08:23:49 -0500
commit18b6c8cd8af6cc7f35180cedc4adb3236cc1a1b8 (patch)
treec58a863cb0c11ffc1195c32ec1cca598531c20e3 /board/mpc8641hpcn
parent5c9efb36a6b5431423f52888a0e3b4b515fe7eca (diff)
downloadblackbird-obmc-uboot-18b6c8cd8af6cc7f35180cedc4adb3236cc1a1b8.tar.gz
blackbird-obmc-uboot-18b6c8cd8af6cc7f35180cedc4adb3236cc1a1b8.zip
Get MPC8641HPCN flash images working.
Enable the CFI driver. Remove bogus LAWBAR7 cruft. Use correct TEXT_BASE, Fixup load script. Enable SPD EEPROM during DDR setup. Use generic RFC 1918 IP addresses by default.
Diffstat (limited to 'board/mpc8641hpcn')
-rw-r--r--board/mpc8641hpcn/config.mk3
-rw-r--r--board/mpc8641hpcn/init.S17
-rw-r--r--board/mpc8641hpcn/u-boot.lds4
3 files changed, 3 insertions, 21 deletions
diff --git a/board/mpc8641hpcn/config.mk b/board/mpc8641hpcn/config.mk
index 63b9779af0..4bdceec4dc 100644
--- a/board/mpc8641hpcn/config.mk
+++ b/board/mpc8641hpcn/config.mk
@@ -25,8 +25,7 @@
# default CCSRBAR is at 0xff700000
# assume U-Boot is less than 0.5MB
#
-#TEXT_BASE = 0xfff01000
-TEXT_BASE = 0x00400000
+TEXT_BASE = 0xfff01000
PLATFORM_CPPFLAGS += -DCONFIG_MPC86xx=1
PLATFORM_CPPFLAGS += -DCONFIG_MPC8641=1 -maltivec -mabi=altivec -msoft-float
diff --git a/board/mpc8641hpcn/init.S b/board/mpc8641hpcn/init.S
index 9d43de5539..4d555a509f 100644
--- a/board/mpc8641hpcn/init.S
+++ b/board/mpc8641hpcn/init.S
@@ -80,23 +80,6 @@
#define LAWAR7 (LAWAR_EN | LAWAR_TRGT_IF_LBC | (LAWAR_SIZE & LAWAR_SIZE_32M))
-/*
- * Rapid IO at 0xc000_0000 for 512 M
- */
-/*
-#ifdef CFG_INIT_RAM_LOCK
-#define LAWBAR7 ((CFG_RIO_MEM_BASE>>12) & 0xffffff)
-#define LAWAR7 (LAWAR_EN | LAWAR_TRGT_IF_RIO | (LAWAR_SIZE & LAWAR_SIZE_512M))
-#endif
-*/
-/*
- * Stack at 0xfc00_0000 for 32M on LBC
- */
-#if !defined(CFG_INIT_RAM_LOCK)
-#define LAWBAR7 ((CFG_INIT_RAM_ADDR>>12) & 0xffffff)
-#define LAWAR7 (LAWAR_EN | LAWAR_TRGT_IF_LBC | (LAWAR_SIZE & LAWAR_SIZE_32M))
-#endif
-
.section .bootpg, "ax"
.globl law_entry
law_entry:
diff --git a/board/mpc8641hpcn/u-boot.lds b/board/mpc8641hpcn/u-boot.lds
index dbe8e4fab1..c5c40e7eb4 100644
--- a/board/mpc8641hpcn/u-boot.lds
+++ b/board/mpc8641hpcn/u-boot.lds
@@ -28,7 +28,7 @@ SEARCH_DIR(/lib); SEARCH_DIR(/usr/lib); SEARCH_DIR(/usr/local/lib); SEARCH_DIR(/
__DYNAMIC = 0; */
SECTIONS
{
-/* .resetvec 0xFFF00100 :
+ .resetvec 0xFFF00100 :
{
*(.resetvec)
} = 0xffff
@@ -38,7 +38,7 @@ SECTIONS
cpu/mpc86xx/start.o (.bootpg)
board/mpc8641hpcn/init.o (.bootpg)
} = 0xffff
-*/
+
/* Read-only sections, merged into text segment: */
. = + 1024;
.interp : { *(.interp) }
OpenPOWER on IntegriCloud