[PATCH 07/15] RX-51: Fixed compilation on top of master (changes from Beagle Board)

[Pali Rohár]

---
 board/nokia/rx51/Makefile    |    7 ++++---
 board/nokia/rx51/config.mk   |    2 +-
 board/nokia/rx51/rx51.c      |    2 +-
 include/configs/nokia_rx51.h |    7 +++++++
 4 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/board/nokia/rx51/Makefile b/board/nokia/rx51/Makefile
index 31ad6fd..92a0c9a 100644
--- a/board/nokia/rx51/Makefile
+++ b/board/nokia/rx51/Makefile
@@ -23,15 +23,16 @@
 
 include $(TOPDIR)/config.mk
 
-LIB	= $(obj)lib$(BOARD).a
+LIB	= $(obj)lib$(BOARD).o
 
-COBJS	:= rx51.o
+COBJS-y	:= $(BOARD).o
 
+COBJS	:= $(sort $(COBJS-y))
 SRCS	:= $(COBJS:.o=.c)
 OBJS	:= $(addprefix $(obj),$(COBJS))
 
 $(LIB):	$(obj).depend $(OBJS)
-	$(AR) $(ARFLAGS) $@ $(OBJS)
+	$(call cmd_link_o_target, $(OBJS))
 
 clean:
 	rm -f $(OBJS)
diff --git a/board/nokia/rx51/config.mk b/board/nokia/rx51/config.mk
index 6c81a34..3477f09 100644
--- a/board/nokia/rx51/config.mk
+++ b/board/nokia/rx51/config.mk
@@ -30,4 +30,4 @@
 # (mem base + reserved)
 
 # For use with external or internal boots.
-TEXT_BASE = 0x80e80000
+CONFIG_SYS_TEXT_BASE = 0x80008000
diff --git a/board/nokia/rx51/rx51.c b/board/nokia/rx51/rx51.c
index 347d08a..96e65d6 100644
--- a/board/nokia/rx51/rx51.c
+++ b/board/nokia/rx51/rx51.c
@@ -38,7 +38,7 @@
 #include <asm/io.h>
 #include <asm/arch/mux.h>
 #include <asm/arch/sys_proto.h>
-#include <asm/arch/gpio.h>
+#include <asm/omap_gpio.h>
 #include <asm/mach-types.h>
 #include "rx51.h"
 
diff --git a/include/configs/nokia_rx51.h b/include/configs/nokia_rx51.h
index bc4bd0b..6da56f5 100644
--- a/include/configs/nokia_rx51.h
+++ b/include/configs/nokia_rx51.h
@@ -316,6 +316,13 @@ int rx51_kp_getc(void);
 #define CONFIG_ENV_OFFSET		boot_flash_off
 #define CONFIG_ENV_ADDR			SMNAND_ENV_OFFSET
 
+#define CONFIG_SYS_SDRAM_BASE		PHYS_SDRAM_1
+#define CONFIG_SYS_INIT_RAM_ADDR	0x4020f800
+#define CONFIG_SYS_INIT_RAM_SIZE	0x800
+#define CONFIG_SYS_INIT_SP_ADDR		(CONFIG_SYS_INIT_RAM_ADDR + \
+					 CONFIG_SYS_INIT_RAM_SIZE - \
+					 GENERATED_GBL_DATA_SIZE)
+
 /*-----------------------------------------------------------------------
  * CFI FLASH driver setup
  */
-- 
1.7.4.1


--nextPart1511561.nRVgJThL9n
Content-Disposition: attachment; filename="0008-RX-51-Add-support-for-resetting-twl4030-watchdog.patch"
Content-Transfer-Encoding: 7Bit
Content-Type: text/x-patch; charset="UTF-8"; name="0008-RX-51-Add-support-for-resetting-twl4030-watchdog.patch"