diff options
| author | Dima Zavin <dima@android.com> | 2010-04-12 00:18:35 -0700 |
|---|---|---|
| committer | Dima Zavin <dima@android.com> | 2010-04-12 00:18:35 -0700 |
| commit | 1ad6a22de0e4790df9b12ee1c43fc0fd8281aa77 (patch) | |
| tree | d5fd1928e998c3fbc0b5baa82ce50ee7d81c8088 | |
| parent | 540526a433e60200974544001ef8728dc7cfbe83 (diff) | |
| download | lk-qcom-dima-patches.tar.gz | |
msm7x30: define the membase for 7x30 at platform level, and add it to definesqcom-dima-patchesqcom-dima-7x30-fixes
Signed-off-by: Dima Zavin <dima@android.com>
| -rw-r--r-- | platform/msm7x30/rules.mk | 7 | ||||
| -rw-r--r-- | target/msm7630_surf/rules.mk | 3 | ||||
| -rw-r--r-- | target/msm7630_surf/tools/makefile | 2 | ||||
| -rw-r--r-- | target/msm7630_surf/tools/mkheader.c | 6 |
4 files changed, 12 insertions, 6 deletions
diff --git a/platform/msm7x30/rules.mk b/platform/msm7x30/rules.mk index 237c4699..2930f687 100644 --- a/platform/msm7x30/rules.mk +++ b/platform/msm7x30/rules.mk @@ -5,7 +5,12 @@ ARM_CPU := cortex-a8 #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 9cc017dc..b3cefd7b 100644 --- a/target/msm7630_surf/rules.mk +++ b/target/msm7630_surf/rules.mk @@ -4,9 +4,6 @@ INCLUDES += -I$(LOCAL_DIR)/include -I$(LK_TOP_DIR)/platform/msm_shared 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 6cadf144..bb2d4e40 100644 --- a/target/msm7630_surf/tools/makefile +++ b/target/msm7630_surf/tools/makefile @@ -37,5 +37,5 @@ emmc_appsboothd.mbn: mkheader $(OUTBIN) $(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 9b039073..7d3ce221 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 @@ int main(int argc, char *argv[]) } size = s.st_size; - base = 0; + base = MEMBASE; magic[0] = 0x00000005; /* appsbl */ magic[1] = 0x00000002; /* nand */ |