Skip to contentSkip to conversation

Fix building various esd boards in u-boot-testing repo's hastable branch

PATCH New matthias.fuchs at esd.eu 3 participants 6 messages Jul 26, 2010 – Aug 9, 2010

lore
Share & tools
lore

matthias.fuchs at esd.eu

author
#0 lore raw

cover Fix building various esd boards in u-boot-testing repo's hastable branch

From: Matthias Fuchs <[email protected]>

Fix building various esd boards in u-boot-testing repo's hastable branch.

Matthias Fuchs (3):
ppc4xx: Fix building of AR405 board
ppc4xx: Fix building of CANBT board
ppc4xx: Fix building of PMC440 board

 board/esd/ar405/config.mk  |    9 +--------
 board/esd/canbt/config.mk  |    8 +-------
 board/esd/pmc440/config.mk |    2 +-
 include/configs/AR405.h    |   10 +++++-----
 include/configs/CANBT.h    |    6 +++---
 include/configs/PMC440.h   |    8 ++++----
 6 files changed, 15 insertions(+), 28 deletions(-)
author
#1 lore raw

PATCH 1/3 ppc4xx: Fix building of AR405 board

From: Matthias Fuchs <[email protected]>

Update image size after addition of new environment handling.

Signed-off-by Matthias Fuchs <[email protected]>
---
 board/esd/ar405/config.mk |    9 +--------
 include/configs/AR405.h   |   10 +++++-----
 2 files changed, 6 insertions(+), 13 deletions(-)
board/esd/ar405/config.mk +1 -8
index 3e8baf6..da7c107 100644
@@ -20,11 +20,4 @@
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston,
 # MA 02111-1307 USA
 #
-
-#
-# esd AR405 boards
-#
-
-#TEXT_BASE = 0xFFFE0000
-#TEXT_BASE = 0xFFFD0000
-TEXT_BASE = 0xFFFC0000
+TEXT_BASE = 0xFFFA0000
include/configs/AR405.h +5 -5
index 52ead43..45c64c2 100644
@@ -175,9 +175,9 @@
  * Please note that CONFIG_SYS_SDRAM_BASE _must_ start at 0
  */
 #define CONFIG_SYS_SDRAM_BASE		0x00000000
-#define CONFIG_SYS_FLASH_BASE		0xFFFC0000
-#define CONFIG_SYS_MONITOR_BASE	CONFIG_SYS_FLASH_BASE
-#define CONFIG_SYS_MONITOR_LEN		(256 * 1024)	/* Reserve 256 kB for Monitor	*/
+#define CONFIG_SYS_FLASH_BASE		CONFIG_SYS_MONITOR_BASE
+#define CONFIG_SYS_MONITOR_BASE		TEXT_BASE
+#define CONFIG_SYS_MONITOR_LEN		(~(TEXT_BASE) + 1)
 #define CONFIG_SYS_MALLOC_LEN		(128 * 1024)	/* Reserve 128 kB for malloc()	*/
 
 /*

@@ -209,11 +209,11 @@
 #define CONFIG_SYS_FLASH_EMPTY_INFO		/* print 'E' for empty sector on flinfo */
 
 #define CONFIG_ENV_IS_IN_FLASH	1
-#define CONFIG_ENV_ADDR		0xFFFB0000	/* Address of Environment Sector*/
+#define CONFIG_ENV_ADDR		(CONFIG_SYS_MONITOR_BASE - CONFIG_ENV_SECT_SIZE)
 #define CONFIG_ENV_SECT_SIZE	0x10000 /* see README - env sector total size	*/
 #define CONFIG_ENV_SIZE		0x04000	        /* Size of Environment	        */
 
-#define CONFIG_ENV_ADDR_REDUND     0xFFFA0000
+#define CONFIG_ENV_ADDR_REDUND  (CONFIG_ENV_ADDR - CONFIG_ENV_SECT_SIZE)
 #define CONFIG_ENV_SIZE_REDUND	CONFIG_ENV_SIZE
 
 /*
Signature · 1 line
1.6.1
author
#2 lore raw

PATCH 2/3 ppc4xx: Fix building of CANBT board

From: Matthias Fuchs <[email protected]>

Update image size after addition of new environment handling.

Signed-off-by Matthias Fuchs <[email protected]>
---
 board/esd/canbt/config.mk |    8 +-------
 include/configs/CANBT.h   |    6 +++---
 2 files changed, 4 insertions(+), 10 deletions(-)
board/esd/canbt/config.mk +1 -7
index 80076cd..ae855dc 100644
@@ -20,10 +20,4 @@
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston,
 # MA 02111-1307 USA
 #
-
-#
-# esd ADCIOP boards
-#
-
-TEXT_BASE = 0xFFFE0000
-#TEXT_BASE = 0xFFFD0000
+TEXT_BASE = 0xFFFC0000
include/configs/CANBT.h +3 -3
index cdba81d..115a6f9 100644
@@ -120,9 +120,9 @@
  * Please note that CONFIG_SYS_SDRAM_BASE _must_ start at 0
  */
 #define CONFIG_SYS_SDRAM_BASE		0x00000000
-#define CONFIG_SYS_FLASH_BASE		0xFFFE0000
-#define CONFIG_SYS_MONITOR_BASE	CONFIG_SYS_FLASH_BASE
-#define CONFIG_SYS_MONITOR_LEN		(128 * 1024)	/* Reserve 128 kB for Monitor	*/
+#define CONFIG_SYS_FLASH_BASE		CONFIG_SYS_MONITOR_BASE
+#define CONFIG_SYS_MONITOR_BASE		TEXT_BASE
+#define CONFIG_SYS_MONITOR_LEN		(~(TEXT_BASE) + 1)
 #define CONFIG_SYS_MALLOC_LEN		(128 * 1024)	/* Reserve 128 kB for malloc()	*/
 
 /*
Signature · 1 line
1.6.1
author
#3 lore raw

PATCH 3/3 ppc4xx: Fix building of PMC440 board

From: Matthias Fuchs <[email protected]>

Update image size and default environment
after addition of new environment handling.

Signed-off-by Matthias Fuchs <[email protected]>
---
 board/esd/pmc440/config.mk |    2 +-
 include/configs/PMC440.h   |    8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)
board/esd/pmc440/config.mk +1 -1
index 91e65ec..6e9f735 100644
@@ -23,7 +23,7 @@
 sinclude $(OBJTREE)/board/$(BOARDDIR)/config.tmp
 
 ifndef TEXT_BASE
-TEXT_BASE = 0xFFFA0000
+TEXT_BASE = 0xFFF90000
 endif
 
 PLATFORM_CPPFLAGS += -DCONFIG_440=1
include/configs/PMC440.h +4 -4
index c2fb56c..3c19f52 100644
@@ -53,7 +53,7 @@
  * Base addresses -- Note these are effective addresses where the
  * actual resources get mapped (not physical addresses)
  *----------------------------------------------------------------------*/
-#define CONFIG_SYS_MONITOR_LEN		(384  * 1024)	/* Reserve 384 kB for Monitor   */
+#define CONFIG_SYS_MONITOR_LEN		(~(TEXT_BASE) + 1)
 #define CONFIG_SYS_MALLOC_LEN		(1024 * 1024)	/* Reserve 256 kB for malloc()  */
 
 #define CONFIG_PRAM		0	/* use pram variable to overwrite */

@@ -61,7 +61,7 @@
 #define CONFIG_SYS_BOOT_BASE_ADDR	0xf0000000
 #define CONFIG_SYS_SDRAM_BASE		0x00000000	/* _must_ be 0          */
 #define CONFIG_SYS_FLASH_BASE		0xfc000000	/* start of FLASH       */
-#define CONFIG_SYS_MONITOR_BASE	TEXT_BASE
+#define CONFIG_SYS_MONITOR_BASE		TEXT_BASE
 #define CONFIG_SYS_NAND_ADDR		0xd0000000	/* NAND Flash           */
 #define CONFIG_SYS_OCM_BASE		0xe0010000	/* ocm                  */
 #define CONFIG_SYS_OCM_DATA_ADDR	CONFIG_SYS_OCM_BASE

@@ -301,8 +301,8 @@
 	"fdt_addr_r=800000\0"						\
 	"fpga=fpga loadb 0 ${fpga_addr}\0"				\
 	"load=tftp 200000 /tftpboot/pmc440/u-boot.bin\0"		\
-	"update=protect off fffa0000 ffffffff;era fffa0000 ffffffff;"	\
-		"cp.b 200000 fffa0000 60000\0"				\
+	"update=protect off fff90000 ffffffff;era fff90000 ffffffff;"	\
+		"cp.b 200000 fff90000 70000\0"				\
 	""
 
 #define CONFIG_BOOTDELAY	3	/* autoboot after 3 seconds     */
Signature · 1 line
1.6.1
#4 lore raw

PATCH 1/3 ppc4xx: Fix building of AR405 board

In reply to matthias.fuchs at esd.eu

Hallo Stefan,

Quoted 9 lines · In message <[email protected]> Matthias…

From: Matthias Fuchs <[email protected]>

Update image size after addition of new environment handling.

Signed-off-by Matthias Fuchs <[email protected]>
---
 board/esd/ar405/config.mk |    9 +--------
 include/configs/AR405.h   |   10 +++++-----
 2 files changed, 6 insertions(+), 13 deletions(-)

Ping... See

http://thread.gmane.org/gmane.comp.boot-loaders.u-boot/81737/focus=81738

Best regards,

Wolfgang Denk

Signature · 5 lines
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de
Do you suppose the reason the ends of the `Intel Inside'  logo  don't
match up is that it was drawn on a Pentium?
#5 lore raw

cover Fix building various esd boards in u-boot-testing repo's hastable branch

In reply to matthias.fuchs at esd.eu
Quoted 10 lines · On Monday 26 July 2010 17:17:50 matthias.fuchs at esd.eu wrote:

From: Matthias Fuchs <[email protected]>

Fix building various esd boards in u-boot-testing repo's hastable branch.

Matthias Fuchs (3):
ppc4xx: Fix building of AR405 board
ppc4xx: Fix building of CANBT board
ppc4xx: Fix building of PMC440 board

Quoted 7 lines
 board/esd/ar405/config.mk  |    9 +--------
 board/esd/canbt/config.mk  |    8 +-------
 board/esd/pmc440/config.mk |    2 +-
 include/configs/AR405.h    |   10 +++++-----
 include/configs/CANBT.h    |    6 +++---
 include/configs/PMC440.h   |    8 ++++----
 6 files changed, 15 insertions(+), 28 deletions(-)

Whole patch-series: Applied to u-boot-ppc4xx/master. Thanks.

Cheers,
Stefan

--
DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-0 Fax: (+49)-8142-66989-80 Email: office at denx.de