Add support for ZTE Gen1 bootloader

arch/arm/mach-msm/Kconfig

@@ -437,6 +437,25 @@ config MACH_MSM8X60_FFA
 
 endmenu
 
+choice
+	prompt "Kernel Offset"
+	default ZTE_GEN2
+
+config ZTE_GEN1
+       bool "ZTE Generation 1"
+       help
+         This option is used to indicate if the kernel is to be compiled
+         for a ZTE Blade Generation 1 (phone that is sold with Android 2.1
+         and loads the kernel to 0x02A00000.)
+
+config ZTE_GEN2
+       bool "ZTE Generation 2"
+       help
+         This option is used to indicate if the kernel is to be compiled
+         for a ZTE Blade Generation 1 (phone that is sold with Android 2.1
+         and loads the kernel to 0x02600000.)
+endchoice
+
 config MSM_STACKED_MEMORY
 	bool "Stacked Memory"
 	default y
@@ -448,7 +467,8 @@ config MSM_STACKED_MEMORY
 #ZTE_BOOT_HUANGYANJUN_20100903_01 0x2A00000 ->0x02600000
 config PHYS_OFFSET
 	hex
-	default "0x02600000" if !MSM_STACKED_MEMORY
+	default "0x02A00000" if !MSM_STACKED_MEMORY && ZTE_GEN1
+	default "0x02600000" if !MSM_STACKED_MEMORY && ZTE_GEN2
 	default "0x00000000" if ARCH_QSD8X50 && MSM_SOC_REV_A
 	default "0x20000000" if ARCH_QSD8X50
 	default "0x40200000" if ARCH_MSM8X60

arch/arm/mach-msm/Makefile.boot

@@ -8,10 +8,17 @@ initrd_phys-$(CONFIG_ARCH_MSM7X01A)	:= 0x10800000
 params_phys-$(CONFIG_ARCH_MSM7X25)	:= 0x00200100
 initrd_phys-$(CONFIG_ARCH_MSM7X25)	:= 0x0A000000
 
+ifeq ($(CONFIG_ZTE_GEN1),y)
+# MSM7x27
+   zreladdr-$(CONFIG_ARCH_MSM7X27)	:= 0x02A08000
+params_phys-$(CONFIG_ARCH_MSM7X27)	:= 0x02A00100
+initrd_phys-$(CONFIG_ARCH_MSM7X27)	:= 0x0A000000
+else
 # MSM7x27
    zreladdr-$(CONFIG_ARCH_MSM7X27)	:= 0x02608000
 params_phys-$(CONFIG_ARCH_MSM7X27)	:= 0x02600100
 initrd_phys-$(CONFIG_ARCH_MSM7X27)	:= 0x0A000000
+endif
 
 # MSM7x30
    zreladdr-$(CONFIG_ARCH_MSM7X30)	:= 0x00208000

arch/arm/mach-msm/board-zte-amigo.c

@@ -125,7 +125,7 @@ when         who        what, where, why                             comment tag
 #endif
 
 #ifdef CONFIG_ANDROID_RAM_CONSOLE
-#define MSM_RAM_CONSOLE_PHYS  0x02500000 
+#define MSM_RAM_CONSOLE_PHYS  (PHYS_OFFSET - 0x100000)
 #define MSM_RAM_CONSOLE_SIZE  SZ_1M
 #endif
 

arch/arm/mach-msm/board-zte-blade.c

@@ -131,7 +131,7 @@ when         who        what, where, why                             comment tag
 #endif
 
 #ifdef CONFIG_ANDROID_RAM_CONSOLE
-#define MSM_RAM_CONSOLE_PHYS  0x02500000 
+#define MSM_RAM_CONSOLE_PHYS  (PHYS_OFFSET - 0x100000)
 #define MSM_RAM_CONSOLE_SIZE  SZ_1M
 #endif
 

arch/arm/mach-msm/board-zte-joe.c

@@ -132,7 +132,7 @@ when         who        what, where, why                             comment tag
 #endif
 
 #ifdef CONFIG_ANDROID_RAM_CONSOLE
-#define MSM_RAM_CONSOLE_PHYS  0x02500000 
+#define MSM_RAM_CONSOLE_PHYS  (PHYS_OFFSET - 0x100000)
 #define MSM_RAM_CONSOLE_SIZE  SZ_1M
 #endif
 

arch/arm/mach-msm/board-zte-joecdma.c

@@ -131,7 +131,7 @@ when         who        what, where, why                             comment tag
 #endif
 
 #ifdef CONFIG_ANDROID_RAM_CONSOLE
-#define MSM_RAM_CONSOLE_PHYS  0x02500000 
+#define MSM_RAM_CONSOLE_PHYS  (PHYS_OFFSET - 0x100000)
 #define MSM_RAM_CONSOLE_SIZE  SZ_1M
 #endif
 

arch/arm/mach-msm/board-zte-mooncake.c

@@ -134,7 +134,7 @@ extern struct atmel_i2c_platform_data atmel_data;
 #endif
 
 #ifdef CONFIG_ANDROID_RAM_CONSOLE
-#define MSM_RAM_CONSOLE_PHYS  0x02500000 
+#define MSM_RAM_CONSOLE_PHYS  (PHYS_OFFSET - 0x100000)
 #define MSM_RAM_CONSOLE_SIZE  SZ_1M
 #endif
 

arch/arm/mach-msm/board-zte-r750.c

@@ -145,7 +145,7 @@ when         who        what, where, why                             comment tag
 #endif
 
 #ifdef CONFIG_ANDROID_RAM_CONSOLE
-#define MSM_RAM_CONSOLE_PHYS  0x02500000 
+#define MSM_RAM_CONSOLE_PHYS  (PHYS_OFFSET - 0x100000)
 #define MSM_RAM_CONSOLE_SIZE  SZ_1M
 #endif