From f39c5d1e6a2080c6913e11fb30899c8b2adfb0f3 Mon Sep 17 00:00:00 2001
From: Matthias Fuchs <matthias.fuchs@esd.eu>
Date: Fri, 24 Oct 2014 12:44:40 +0200
Subject: [PATCH] ppc4xx: update PMC440 board support
- switch to GENERIC_BOARD
- fix env support from eeprom
Signed-off-by: Matthias Fuchs <matthias.fuchs@esd.eu>
---
board/esd/pmc440/cmd_pmc440.c | 6 +++---
include/configs/PMC440.h | 4 ++++
2 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/board/esd/pmc440/cmd_pmc440.c b/board/esd/pmc440/cmd_pmc440.c
index 3481e46436..40b135f2ba 100644
--- a/board/esd/pmc440/cmd_pmc440.c
+++ b/board/esd/pmc440/cmd_pmc440.c
@@ -347,16 +347,16 @@ int do_painit(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
return 1;
}
- base = gd->bd->bi_memsize;
+ base = (u32)gd->ram_size;
#if defined(CONFIG_LOGBUFFER)
base -= LOGBUFF_LEN + LOGBUFF_OVERHEAD;
#endif
/*
- * gd->bd->bi_memsize == physical ram size - CONFIG_SYS_MEM_TOP_HIDE
+ * gd->ram_size == physical ram size - CONFIG_SYS_MEM_TOP_HIDE
*/
param = base - (pram << 10);
printf("PARAM: @%08x\n", param);
- debug("memsize=0x%08x, base=0x%08x\n", (u32)gd->bd->bi_memsize, base);
+ debug("memsize=0x%08x, base=0x%08x\n", (u32)gd->ram_size, base);
/* clear entire PA ram */
memset((void*)param, 0, (pram << 10));
diff --git a/include/configs/PMC440.h b/include/configs/PMC440.h
index c5e2f164ce..c29429d368 100644
--- a/include/configs/PMC440.h
+++ b/include/configs/PMC440.h
@@ -29,6 +29,9 @@
#define CONFIG_SYS_TEXT_BASE 0xFFF90000
#endif
+#define CONFIG_SYS_GENERIC_BOARD
+#define CONFIG_DISPLAY_BOARDINFO
+
#define CONFIG_SYS_CLK_FREQ 33333400
#if 0 /* temporary disabled because OS/9 does not like dcache on startup */
@@ -133,6 +136,7 @@
#endif
#ifdef CONFIG_ENV_IS_IN_EEPROM
+#define CONFIG_I2C_ENV_EEPROM_BUS 0
#define CONFIG_ENV_OFFSET 0 /* environment starts at the beginning of the EEPROM */
#define CONFIG_ENV_SIZE 0x1000 /* 4096 bytes may be used for env vars */
#endif
--
2.39.5