msm7x30: define the membase for 7x30 at platform level, and add it to defines
Signed-off-by: Dima Zavin <dima@android.com>
diff --git a/platform/msm7x30/rules.mk b/platform/msm7x30/rules.mk
index 237c469..2930f68 100644
--- a/platform/msm7x30/rules.mk
+++ b/platform/msm7x30/rules.mk
@@ -5,7 +5,12 @@
#arm1136j-s
CPU := generic
-DEFINES += WITH_CPU_EARLY_INIT=1 WITH_CPU_WARM_BOOT=1 MEMBASE=0
+MEMBASE := 0x00100000
+MEMSIZE := 0x00100000 # 1MB
+
+DEFINES += WITH_CPU_EARLY_INIT=1 WITH_CPU_WARM_BOOT=1
+
+DEFINES += MEMBASE=$(MEMBASE)
INCLUDES += -I$(LOCAL_DIR)/include
diff --git a/target/msm7630_surf/rules.mk b/target/msm7630_surf/rules.mk
index 9cc017d..b3cefd7 100644
--- a/target/msm7630_surf/rules.mk
+++ b/target/msm7630_surf/rules.mk
@@ -4,9 +4,6 @@
PLATFORM := msm7x30
-MEMBASE := 0x00000000 # SMI
-MEMSIZE := 0x00100000 # 1MB
-
BASE_ADDR := 0x00200000
TAGS_ADDR := BASE_ADDR+0x00000100
diff --git a/target/msm7630_surf/tools/makefile b/target/msm7630_surf/tools/makefile
index 6cadf14..bb2d4e4 100644
--- a/target/msm7630_surf/tools/makefile
+++ b/target/msm7630_surf/tools/makefile
@@ -37,5 +37,5 @@
$(SRC_DIR)/mkheader $(OUTBIN) $(APPSBOOTHEADER_DIR)/emmc_appsboothd.mbn unified-boot
mkheader: $(SRC_DIR)/mkheader.c
- ${COMPILER} $(SRC_DIR)/mkheader.c -o $(SRC_DIR)/mkheader
+ ${COMPILER} -DMEMBASE=$(MEMBASE) $(SRC_DIR)/mkheader.c -o $(SRC_DIR)/mkheader
diff --git a/target/msm7630_surf/tools/mkheader.c b/target/msm7630_surf/tools/mkheader.c
index 9b03907..7d3ce22 100644
--- a/target/msm7630_surf/tools/mkheader.c
+++ b/target/msm7630_surf/tools/mkheader.c
@@ -7,6 +7,10 @@
#include <sys/stat.h>
+#ifndef MEMBASE
+#define MEMBASE 0
+#endif
+
int main(int argc, char *argv[])
{
struct stat s;
@@ -43,7 +47,7 @@
}
size = s.st_size;
- base = 0;
+ base = MEMBASE;
magic[0] = 0x00000005; /* appsbl */
magic[1] = 0x00000002; /* nand */
