commit 23b9de5a7302c4ae286b0b3bd9ab3518657369d2
author Linux Build Service Account <lnxbuild@localhost> Tue Jul 26 12:21:56 2011 -0700
committer QuIC Gerrit Code Review <code-review@localhost> Tue Jul 26 12:21:57 2011 -0700
tree 4889fe2cc6c73722023aa3130ef1127a5d7f31e5
parent 4f378133e3840690b87c0a8225c56a4376383930
parent 97d0f090969a6aebed2537b46cce452de846fc89

Merge "arch/arm: Add dsb() function for ARMv6 and ARMv7 devices."

AndroidBoot.mk

diff --git a/AndroidBoot.mk b/AndroidBoot.mk
index 53959fe..4dd8553 100644
--- a/AndroidBoot.mk
+++ b/AndroidBoot.mk
@@ -3,7 +3,7 @@
 TARGET_BOOTLOADER := $(PRODUCT_OUT)/appsboot.mbn
 BOOTLOADER_OUT := $(TOP)/$(TARGET_OUT_INTERMEDIATES)/BOOTLOADER_OBJ
 
-ifeq ($(call is-flavor,HONEYCOMB),true)
+ifeq ($(call is-android-codename,HONEYCOMB),true)
 CROSS_TOOL := ../../../prebuilt/linux-x86/toolchain/arm-eabi-4.4.3/bin/arm-eabi-
 else
 CROSS_TOOL := ../../../prebuilt/linux-x86/toolchain/arm-eabi-4.4.0/bin/arm-eabi-

target/msm7627_surf/atags.c

diff --git a/target/msm7627_surf/atags.c b/target/msm7627_surf/atags.c
index da62002..d5995e0 100644
--- a/target/msm7627_surf/atags.c
+++ b/target/msm7627_surf/atags.c
@@ -69,7 +69,7 @@
 					*ptr++ = size_in_mb;
 				}
 				else
-					*ptr++ = ram_ptable.parts[i].size - (2*SIZE_1M);
+					*ptr++ = ram_ptable.parts[i].size;
 
 				*ptr++ = ram_ptable.parts[i].start;
 			}