summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKumar Gala <galak@kernel.crashing.org>2006-01-11 11:12:57 -0600
committerKumar Gala <galak@kernel.crashing.org>2006-01-11 11:12:57 -0600
commit9260a56151e9aed923e61994b4c368297690a78e (patch)
treeecef7be07712def490ddaccfba554518fe56d88f
parentc7428d49ace4f2f16174ca028fe7072c02a473c8 (diff)
downloadu-boot-9260a56151e9aed923e61994b4c368297690a78e.tar.gz
u-boot-9260a56151e9aed923e61994b4c368297690a78e.tar.xz
u-boot-9260a56151e9aed923e61994b4c368297690a78e.zip
Make System IO Config Registers board configurable on MPC83xx
Patch by Kumar Gala, 11 Jan 2006
-rw-r--r--CHANGELOG3
-rw-r--r--cpu/mpc83xx/cpu_init.c8
-rw-r--r--include/configs/MPC8349ADS.h4
-rw-r--r--include/configs/TQM834x.h4
4 files changed, 17 insertions, 2 deletions
diff --git a/CHANGELOG b/CHANGELOG
index c1da98fc51..4f4073346b 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -2,6 +2,9 @@
Changes since U-Boot 1.1.4:
======================================================================
+* Make System IO Config Registers board configurable on MPC83xx
+ Patch by Kumar Gala, 11 Jan 2006
+
* Add support for 28F256J3A flah (=> 64 MB) on PM520 board
* Fix compiler problem with at91rm9200dk board.
diff --git a/cpu/mpc83xx/cpu_init.c b/cpu/mpc83xx/cpu_init.c
index dcb34457b1..e75b8b7fde 100644
--- a/cpu/mpc83xx/cpu_init.c
+++ b/cpu/mpc83xx/cpu_init.c
@@ -63,8 +63,12 @@ void cpu_init_f (volatile immap_t * im)
im->sysconf.spcr |= SPCR_TBEN;
/* System General Purpose Register */
- im->sysconf.sicrh = SICRH_TSOBI1;
- im->sysconf.sicrl = SICRL_LDP_A;
+#ifdef CFG_SICRH
+ im->sysconf.sicrh = CFG_SICRH;
+#endif
+#ifdef CFG_SICRL
+ im->sysconf.sicrl = CFG_SICRL;
+#endif
/*
* Memory Controller:
diff --git a/include/configs/MPC8349ADS.h b/include/configs/MPC8349ADS.h
index d6d2fabeec..f7f09b8d1e 100644
--- a/include/configs/MPC8349ADS.h
+++ b/include/configs/MPC8349ADS.h
@@ -506,6 +506,10 @@
HRCWH_TSEC2M_IN_GMII )
#endif
+/* System IO Config */
+#define CFG_SICRH SICRH_TSOBI1
+#define CFG_SICRL SICRL_LDP_A
+
#define CFG_HID0_INIT 0x000000000
#define CFG_HID0_FINAL CFG_HID0_INIT
diff --git a/include/configs/TQM834x.h b/include/configs/TQM834x.h
index 41f44c5a37..1cf66a99b4 100644
--- a/include/configs/TQM834x.h
+++ b/include/configs/TQM834x.h
@@ -417,6 +417,10 @@ extern int tqm834x_num_flash_banks;
HRCWH_TSEC2M_IN_GMII )
#endif
+/* System IO Config */
+#define CFG_SICRH SICRH_TSOBI1
+#define CFG_SICRL SICRL_LDP_A
+
/* i-cache and d-cache disabled */
#define CFG_HID0_INIT 0x000000000
#define CFG_HID0_FINAL CFG_HID0_INIT