Skip to content

Commit 200df6c

Browse files
HashcodeHashcode
committed
kc1 config: update menu and arch settings
1 parent 8bd4375 commit 200df6c

File tree

1 file changed

+31
-15
lines changed

1 file changed

+31
-15
lines changed

‎include/configs/omap4_kc1.h

Lines changed: 31 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -96,6 +96,7 @@
9696
#define CONFIG_EFI_PARTITION
9797
#define CONFIG_PARTITION_UUIDS
9898
#define CONFIG_CMD_PART
99+
#define CONFIG_SUPPORT_EMMC_BOOT
99100

100101
/* Defines for SDRAM init */
101102
#undef CONFIG_SYS_EMIF_PRECALCULATED_TIMING_REGS
@@ -144,7 +145,7 @@
144145
#define CONFIG_ADDR_ATAGS (MEMORY_BASE + 0x100)
145146
#define CONFIG_ADDR_DOWNLOAD (MEMORY_BASE + 0x02000000)
146147
//#define CONFIG_FB_ADDR (MEMORY_BASE + 0x02000000)
147-
#define CONFIG_BOARD_MACH_TYPE 2160
148+
#define CONFIG_MACH_TYPE MACH_TYPE_OMAP_4430SDP
148149
#define DEVICE_TREE 0x80f80000
149150
#define CONFIG_ANDROID_BOOT_IMAGE 1
150151

@@ -155,12 +156,13 @@
155156
"fdt_high=0xffffffff\0" \
156157
"fdtaddr=0x80f80000\0" \
157158
"initrd_high=no\0" \
158-
"wifimac=FFEEDDCCBBAA\0" \
159-
"serialno=0123456789ABCDEF\0" \
159+
"idme_wifimac=FFEEDDCCBBAA\0" \
160+
"idme_serialno=0123456789ABCDEF\0" \
161+
"idme_settings=0x00000000\0" \
160162
"mmcdev=1\0" \
161163
\
162164
"mmcargs_old=setenv bootargs console=${console} mem=456M@0x80000000 init=/init vram=5M omapfb.vram=0:5M androidboot.console=ttyO2\0" \
163-
"mmcargs_new=setenv dtbootargs console=${console} ${chargermode}androidboot.wifimac=${wifimac} androidboot.serialno=${serialno} androidboot.hardware=otterx\0" \
165+
"mmcargs_new=setenv dtbootargs console=${console} ${chargermode}androidboot.wifimac=${idme_wifimac} androidboot.serialno=${idme_serialno} androidboot.hardware=otterx\0" \
164166
\
165167
"lcdmenu_fg_color=7\0" \
166168
"lcdmenu_bg_color=0\0" \
@@ -171,19 +173,33 @@
171173
"lcdmenuentry_02=ADVANCED -->=lcdmenu show 1\0" \
172174
"lcdmenu_1=ADVANCED MENU\0" \
173175
"lcdmenuentry_10=<-- BACK=lcdmenu show 0\0" \
174-
"lcdmenuentry_11=CHARGER MODE: \e[32mON\e[37m =lcdmenu show 0\0" \
175-
"lcdmenuentry_12=SERIAL CONSOLE: \e[37mOFF\e[37m =lcdmenu show 0\0" \
176-
"lcdmenuentry_13=SERIAL #: \e[36m0123456789012345\e[37m =lcdmenu show 0\0" \
177-
"lcdmenuentry_14=WIFI MAC ADDR: \e[36m00:00:00:00:00:00\e[37m =lcdmenu show 0\0" \
178-
"lcdmenuentry_15=PARTITION MODE: \e[36mOTTERX\e[37m =lcdmenu show 0\0" \
179-
"lcdmenu_2=BOOT CONSOLE MENU\0" \
176+
"lcdmenuentry_11=CHARGER MODE: #charger_mode_flag# =lcdmenu show #charger_mode_menu_id#\0" \
177+
"lcdmenuentry_12=SERIAL CONSOLE: #serial_console_flag# =lcdmenu show #serial_console_menu_id#\0" \
178+
"lcdmenuentry_13=SERIAL #: #serial_no# =lcdmenu show 0\0" \
179+
"lcdmenuentry_14=WIFI MAC ADDR: #wifi_mac# =lcdmenu show 0\0" \
180+
"lcdmenuentry_15=PARTITION MODE: #partition_mode# =lcdmenu show #partition_mode_menu_id#\0" \
181+
"lcdmenu_2=CHARGER MODE MENU\0" \
180182
"lcdmenuentry_20=<-- BACK=lcdmenu show 1\0" \
181-
"lcdmenuentry_21=\e[33m[CONFIRM]\e[37m SET MODE: \e[32mON\e[37m =lcdmenu show 1\0" \
182-
"lcdmenu_3=PARTITION MODE MENU\0" \
183+
"lcdmenuentry_21=\e[33m[CONFIRM]\e[37m SET MODE: \e[32mOFF\e[37m =idme_settings 0 0; lcdmenu show 1\0" \
184+
"lcdmenu_3=CHARGER MODE MENU\0" \
183185
"lcdmenuentry_30=<-- BACK=lcdmenu show 1\0" \
184-
"lcdmenuentry_31=\e[32m** WARNING!!!!\e[37m =\0" \
185-
"lcdmenuentry_32=\e[32m** SWITCH ERASES ENTIRE DEVICE!\e[37m =\0" \
186-
"lcdmenuentry_33=\e[33m[CONFIRM]\e[37m SET MODE: \e[36mAMAZON\e[37m =lcdmenu show 1\0"
186+
"lcdmenuentry_31=\e[33m[CONFIRM]\e[37m SET MODE: \e[32mON\e[37m =idme_settings 0 1; lcdmenu show 1\0" \
187+
"lcdmenu_4=BOOT CONSOLE MENU\0" \
188+
"lcdmenuentry_40=<-- BACK=lcdmenu show 1\0" \
189+
"lcdmenuentry_41=\e[33m[CONFIRM]\e[37m SET MODE: \e[36mOFF\e[37m =idme_settings 1 0; lcdmenu show 1\0" \
190+
"lcdmenu_5=BOOT CONSOLE MENU\0" \
191+
"lcdmenuentry_50=<-- BACK=lcdmenu show 1\0" \
192+
"lcdmenuentry_51=\e[33m[CONFIRM]\e[37m SET MODE: \e[36mON\e[37m =idme_settings 1 1; lcdmenu show 1\0" \
193+
"lcdmenu_6=PARTITION MODE MENU\0" \
194+
"lcdmenuentry_60=<-- BACK=lcdmenu show 1\0" \
195+
"lcdmenuentry_61=\e[31m** WARNING!!!!\e[37m =\0" \
196+
"lcdmenuentry_62=\e[31m** SWITCH ERASES SYSTEM/CACHE/USERDATA!\e[37m =\0" \
197+
"lcdmenuentry_63=\e[33m[CONFIRM]\e[37m SET MODE: \e[36mAMAZON\e[37m =idme_settings 2 0; lcdmenu show 1\0" \
198+
"lcdmenu_7=PARTITION MODE MENU\0" \
199+
"lcdmenuentry_70=<-- BACK=lcdmenu show 1\0" \
200+
"lcdmenuentry_71=\e[31m** WARNING!!!!\e[37m =\0" \
201+
"lcdmenuentry_72=\e[31m** SWITCH ERASES SYSTEM/CACHE/USERDATA!\e[37m =\0" \
202+
"lcdmenuentry_73=\e[33m[CONFIRM]\e[37m SET MODE: \e[36mOTTERX\e[37m =idme_settings 2 1; lcdmenu show 1\0"
187203

188204
#undef CONFIG_BOOTCOMMAND
189205
#define CONFIG_BOOTCOMMAND "run mmcargs_old; run mmcargs_new; booti mmc1"

0 commit comments

Comments
 (0)