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
Merge branch '2022-08-04-Kconfig-migrations'
[platform/kernel/u-boot.git]
/
board
/
keymile
/
km83xx
/
km83xx.c
diff --git
a/board/keymile/km83xx/km83xx.c
b/board/keymile/km83xx/km83xx.c
index
8669715
..
6a7b848
100644
(file)
--- a/
board/keymile/km83xx/km83xx.c
+++ b/
board/keymile/km83xx/km83xx.c
@@
-22,6
+22,7
@@
#include <mpc83xx.h>
#include <i2c.h>
#include <miiphy.h>
#include <mpc83xx.h>
#include <i2c.h>
#include <miiphy.h>
+#include <asm/global_data.h>
#include <asm/io.h>
#include <asm/mmu.h>
#include <asm/processor.h>
#include <asm/io.h>
#include <asm/mmu.h>
#include <asm/processor.h>
@@
-101,8
+102,10
@@
int misc_init_r(void)
int last_stage_init(void)
{
#if defined(CONFIG_TARGET_KMCOGE5NE)
int last_stage_init(void)
{
#if defined(CONFIG_TARGET_KMCOGE5NE)
- struct bfticu_iomap *base =
- (struct bfticu_iomap *)CONFIG_SYS_BFTIC3_BASE;
+ /*
+ * BFTIC3 on the local bus CS4
+ */
+ struct bfticu_iomap *base = (struct bfticu_iomap *)0xB0000000;
u8 dip_switch = in_8((u8 *)&(base->mswitch)) & BFTICU_DIPSWITCH_MASK;
if (dip_switch != 0) {
u8 dip_switch = in_8((u8 *)&(base->mswitch)) & BFTICU_DIPSWITCH_MASK;
if (dip_switch != 0) {
@@
-138,12
+141,11
@@
static int fixed_sdram(void)
udelay(200);
setbits_be32(&im->ddr.sdram_cfg, SDRAM_CFG_MEM_EN);
udelay(200);
setbits_be32(&im->ddr.sdram_cfg, SDRAM_CFG_MEM_EN);
- msize = CONFIG_SYS_DDR_SIZE << 20;
disable_addr_trans();
disable_addr_trans();
- msize = get_ram_size(CONFIG_SYS_SDRAM_BASE,
msize
);
+ msize = get_ram_size(CONFIG_SYS_SDRAM_BASE,
CONFIG_SYS_SDRAM_SIZE
);
enable_addr_trans();
msize /= (1024 * 1024);
enable_addr_trans();
msize /= (1024 * 1024);
- if (CONFIG_SYS_
DDR_SIZE
!= msize) {
+ if (CONFIG_SYS_
SDRAM_SIZE >> 20
!= msize) {
for (ddr_size = msize << 20, ddr_size_log2 = 0;
(ddr_size > 1);
ddr_size = ddr_size >> 1, ddr_size_log2++)
for (ddr_size = msize << 20, ddr_size_log2 = 0;
(ddr_size > 1);
ddr_size = ddr_size >> 1, ddr_size_log2++)
@@
-185,7
+187,7
@@
int dram_init(void)
int checkboard(void)
{
int checkboard(void)
{
- puts("Board:
ABB
" CONFIG_SYS_CONFIG_NAME);
+ puts("Board:
Hitachi
" CONFIG_SYS_CONFIG_NAME);
if (piggy_present())
puts(" with PIGGY.");
if (piggy_present())
puts(" with PIGGY.");
@@
-236,12
+238,8
@@
void post_word_store(ulong value)
int arch_memory_test_prepare(u32 *vstart, u32 *size, phys_addr_t *phys_offset)
{
int arch_memory_test_prepare(u32 *vstart, u32 *size, phys_addr_t *phys_offset)
{
- /*
- * These match CONFIG_SYS_MEMTEST_START and
- * (CONFIG_SYS_MEMTEST_END - CONFIG_SYS_MEMTEST_START)
- */
- *vstart = 0x00100000;
- *size = 0xe00000;
+ *vstart = CONFIG_SYS_MEMTEST_START;
+ *size = CONFIG_SYS_MEMTEST_END - CONFIG_SYS_MEMTEST_START;
debug("arch_memory_test_prepare 0x%08X 0x%08X\n", *vstart, *size);
return 0;
debug("arch_memory_test_prepare 0x%08X 0x%08X\n", *vstart, *size);
return 0;