sunxi: set official machine types

iainb · Jun 20, 2012 · 388b130 · 388b130
1 parent a7d0835
commit 388b130
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/arch/arm/kernel/head.S b/arch/arm/kernel/head.S
@@ -79,15 +79,15 @@ ENTRY(stext)
 
 #if CONFIG_CHIP_ID == 1120
 #warning "chip id: 1120"
-1:	.long 0xdaa
+1:	.long 0x1094
 	.long 0x40000000
 #elif CONFIG_CHIP_ID == 1123
 #warning "chip id: 1123"
-1:	.long 0xda7
+1:	.long 0x1008
 	.long 0x40000000
 #elif CONFIG_CHIP_ID == 1125
 #warning "chip id: 1125"
-1:      .long 0xda8
+1:      .long 0x102A
         .long 0x40000000
 #else
 #error "unsupport chip"

diff --git a/arch/arm/tools/mach-types b/arch/arm/tools/mach-types
@@ -1113,7 +1113,7 @@ blissc			MACH_BLISSC		BLISSC			3491
 thales_adc		MACH_THALES_ADC		THALES_ADC		3492
 ubisys_p9d_evp		MACH_UBISYS_P9D_EVP	UBISYS_P9D_EVP		3493
 atdgp318		MACH_ATDGP318		ATDGP318		3494
-sun4i                   MACH_SUN4I              SUN4I                   3495
-sun5i                   MACH_SUN5I              SUN5I                   3496
-sun6i                   MACH_SUN6I              SUN6I                   3497
-sun3i                   MACH_SUN3I              SUN3I                   3498
+sun4i			MACH_SUN4I		SUN4I			4104
+sun5i			MACH_SUN5I		SUN5I			4138
+sun6i			MACH_SUN6I		SUN6I			4137
+sun3i			MACH_SUN3I		SUN3I			4244