commit 9cab695779f34a2a44b171bf01b0f1307414b782
author Linux Build Service Account <lnxbuild@localhost> Mon May 18 15:39:12 2015 -0700
committer Gerrit - the friendly Code Review server <code-review@localhost> Mon May 18 15:39:12 2015 -0700
tree dbc6c277ad34df0bf1c185a0eed8fa33f042648d
parent 2e32aaeeb3f2e013ad501f2b65ed76958d06abc2
parent 8e2731cb7560c4b1a62e7d1cd393625c0ff29e10

Merge "aboot: mdtp: Address security review"

arch/arm/rules.mk

diff --git a/arch/arm/rules.mk b/arch/arm/rules.mk
index a4bf38c..f45a6eb 100644
--- a/arch/arm/rules.mk
+++ b/arch/arm/rules.mk
@@ -132,23 +132,24 @@
 
 
 
-$(BUILDDIR)/trustzone-test-system-onesegment.ld: $(LOCAL_DIR)/trustzone-test-system-onesegment.ld $(LK_TOP_DIR)/target/$(TARGET)/rules.mk
+$(BUILDDIR)/trustzone-test-system-onesegment.ld: $(LOCAL_DIR)/trustzone-test-system-onesegment.ld $(LK_TOP_DIR)/target/$(TARGET)/rules.mk .FORCE
 	@echo generating $@
 	@$(MKDIR)
 	$(NOECHO)sed "s/%MEMBASE%/$(MEMBASE)/;s/%MEMSIZE%/$(MEMSIZE)/;s/%ROMLITE_PREFLASHED_DATA%/$(ROMLITE_PREFLASHED_DATA)/" < $< > $@
 
-$(BUILDDIR)/trustzone-system-onesegment.ld: $(LOCAL_DIR)/trustzone-system-onesegment.ld $(LK_TOP_DIR)/target/$(TARGET)/rules.mk
+$(BUILDDIR)/trustzone-system-onesegment.ld: $(LOCAL_DIR)/trustzone-system-onesegment.ld $(LK_TOP_DIR)/target/$(TARGET)/rules.mk .FORCE
 	@echo generating $@
 	@$(MKDIR)
 	$(NOECHO)sed "s/%MEMBASE%/$(MEMBASE)/;s/%MEMSIZE%/$(MEMSIZE)/" < $< > $@
 
-$(BUILDDIR)/system-onesegment.ld: $(LOCAL_DIR)/system-onesegment.ld $(LK_TOP_DIR)/target/$(TARGET)/rules.mk
+$(BUILDDIR)/system-onesegment.ld: $(LOCAL_DIR)/system-onesegment.ld $(LK_TOP_DIR)/target/$(TARGET)/rules.mk .FORCE
 	@echo generating $@
 	@$(MKDIR)
 	$(NOECHO)sed "s/%MEMBASE%/$(MEMBASE)/;s/%MEMSIZE%/$(MEMSIZE)/" < $< > $@
 
-$(BUILDDIR)/system-twosegment.ld: $(LOCAL_DIR)/system-twosegment.ld $(LK_TOP_DIR)/target/$(TARGET)/rules.mk
+$(BUILDDIR)/system-twosegment.ld: $(LOCAL_DIR)/system-twosegment.ld $(LK_TOP_DIR)/target/$(TARGET)/rules.mk .FORCE
 	@echo generating $@
 	@$(MKDIR)
 	$(NOECHO)sed "s/%ROMBASE%/$(ROMBASE)/;s/%MEMBASE%/$(MEMBASE)/;s/%MEMSIZE%/$(MEMSIZE)/" < $< > $@
 
+.FORCE:

target/mdm9615/atags.c

diff --git a/target/mdm9615/atags.c b/target/mdm9615/atags.c
index 8d02808..76f46b3 100755
--- a/target/mdm9615/atags.c
+++ b/target/mdm9615/atags.c
@@ -63,7 +63,7 @@
 
 				*ptr++ = 4;
 				*ptr++ = 0x54410002;
-				*ptr++ = SIZE_23M;
+				*ptr++ = (SIZE_23M-SIZE_1M);
 				*ptr++ = ram_ptable.parts[i].start + SIZE_88M;
 
 				if(ram_ptable.parts[i].size == 0x10000000) {