修改fastboot重启后文字显示问题

xiaowei942 · Nov 22, 2012 · 21cb37e · 21cb37e
1 parent cbce2fc
commit 21cb37e
Show file tree

Hide file tree

Showing 6 changed files with 5 additions and 11 deletions.
diff --git a/board/samsung/smdkc110/smdkc110.c b/board/samsung/smdkc110/smdkc110.c
@@ -69,7 +69,7 @@ void if_start_fastboot()
 
  if (!(val & 0x08))
  {
- strcpy((char *)CFG_FASTBOOT_KEY_BOOT_BUFFER, (char *)FASTBOOT_KEY_BOOT_MAGIC);
+ strcpy((char *)CFG_FASTBOOT_TRANSFER_BUFFER, (char *)FASTBOOT_REBOOT_MAGIC);
  }
 }
 

diff --git a/common/cmd_fastboot.c b/common/cmd_fastboot.c
@@ -720,7 +720,6 @@ static int rx_handler (const unsigned char *buffer, unsigned int buffer_size)
  if (!strcmp(cmdbuf + 6, "-bootloader"))
  {
  strcpy((char *)interface.transfer_buffer, (char *)FASTBOOT_REBOOT_MAGIC);
- strcpy((char *)CFG_FASTBOOT_KEY_BOOT_BUFFER, (char *)FASTBOOT_KEY_BOOT_MAGIC);
  }
  else
  {

diff --git a/cpu/s5pc11x/fastboot.c b/cpu/s5pc11x/fastboot.c
@@ -2553,8 +2553,8 @@ int fastboot_preboot(void)
  /* It seems that we require a little time before reading keypad */
  printf("checking mode for fastboot ...\n");
 
- if (memcmp((const char *)CFG_FASTBOOT_KEY_BOOT_BUFFER,
- FASTBOOT_KEY_BOOT_MAGIC, FASTBOOT_KEY_BOOT_MAGIC_SIZE) == 0)
+ if (memcmp((const char *)CFG_FASTBOOT_TRANSFER_BUFFER,
+ FASTBOOT_REBOOT_MAGIC, FASTBOOT_REBOOT_MAGIC_SIZE) == 0)
  {
  return 1;
  }

diff --git a/drivers/video/cfb_console.c b/drivers/video/cfb_console.c
@@ -1294,8 +1294,8 @@ static int video_init (void)
 #endif
 
  memset((void*)CFG_LCD_FBUFFER_BK,0,VIDEO_SIZE);
- if(memcmp((const char *)CFG_FASTBOOT_KEY_BOOT_BUFFER,
- FASTBOOT_KEY_BOOT_MAGIC, FASTBOOT_KEY_BOOT_MAGIC_SIZE) == 0)
+ if(memcmp((const char *)CFG_FASTBOOT_TRANSFER_BUFFER,
+ FASTBOOT_REBOOT_MAGIC, FASTBOOT_REBOOT_MAGIC_SIZE) == 0)
  {
  udelay(750000);
  }

diff --git a/include/configs/smdkv210single.h b/include/configs/smdkv210single.h
@@ -591,7 +591,6 @@
 
 /* Fastboot variables */
 #define CFG_FASTBOOT_TRANSFER_BUFFER (0x30000000)
-#define CFG_FASTBOOT_KEY_BOOT_BUFFER (0x30000010)
 #define CFG_FASTBOOT_TRANSFER_BUFFER_SIZE (0x8000000) /* 128MB */
 #define CFG_FASTBOOT_ADDR_KERNEL (0xC0008000)
 #define CFG_FASTBOOT_ADDR_RAMDISK (0x30A00000)

diff --git a/include/fastboot.h b/include/fastboot.h
@@ -224,10 +224,6 @@ struct fastboot_ptentry
 #define FASTBOOT_BOOT_NAME_SIZE 16
 #define FASTBOOT_BOOT_ARGS_SIZE 512
 
-/* Enable fastboot for pressing a key */
-#define FASTBOOT_KEY_BOOT_MAGIC "KEYBOOT"
-#define FASTBOOT_KEY_BOOT_MAGIC_SIZE 7
-
 /* Input of fastboot_tx_status */
 #define FASTBOOT_TX_ASYNC 0
 #define FASTBOOT_TX_SYNC 1