qiurui
/
rv1126-uboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

rockchip: hotkey: add fdt dump 

Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
Change-Id: I9bb158f13b723decae01069f4324289c599e0e5f
This commit is contained in:
Joseph Chen 2020-02-21 16:32:26 +08:00
parent 9beff1069b
commit b173f38e43
3 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
arch/arm/include/asm/arch-rockchip/hotkey.h
View File

@ -13,6 +13,7 @@ enum hotkey_t {
HK_CLI_OS_GO, HK_CLI_OS_GO,
HK_CMDLINE, HK_CMDLINE,
HK_FASTBOOT, HK_FASTBOOT,
HK_FDT,
HK_INITCALL, HK_INITCALL,
HK_REGULATOR, HK_REGULATOR,
HK_ROCKUSB_DNL, HK_ROCKUSB_DNL,

2
arch/arm/mach-rockchip/board.c
View File

@ -450,6 +450,8 @@ int init_kernel_dtb(void)
ufdt_blob = (void *)gd->fdt_blob; ufdt_blob = (void *)gd->fdt_blob;
gd->fdt_blob = (void *)fdt_addr; gd->fdt_blob = (void *)fdt_addr;
hotkey_run(HK_FDT);
/* /*
* There is a phandle miss match between U-Boot and kernel dtb node, * There is a phandle miss match between U-Boot and kernel dtb node,
* we fixup it in U-Boot live dt nodes. * we fixup it in U-Boot live dt nodes.

5
arch/arm/mach-rockchip/hotkey.c
View File

@ -21,6 +21,7 @@ DECLARE_GLOBAL_DATA_PTR;
#define CTRL_P 0x10 /* parameter(cmdline) dump */ #define CTRL_P 0x10 /* parameter(cmdline) dump */
#define CTRL_R 0x12 /* regulator initial state dump */ #define CTRL_R 0x12 /* regulator initial state dump */
#define CTRL_S 0x13 /* shell(cli) on BOOTM_STATE_OS_GO */ #define CTRL_S 0x13 /* shell(cli) on BOOTM_STATE_OS_GO */
#define CTRL_T 0x14 /* print fdt */
bool is_hotkey(enum hotkey_t id) bool is_hotkey(enum hotkey_t id)
{ {
@ -66,6 +67,10 @@ void hotkey_run(enum hotkey_t id)
if (gd->console_evt == CTRL_I) if (gd->console_evt == CTRL_I)
env_update("bootargs", "initcall_debug debug"); env_update("bootargs", "initcall_debug debug");
break; break;
case HK_FDT:
if (gd->console_evt == CTRL_T)
run_command("fdt print", 0);
break;
#if defined(CONFIG_CONSOLE_DISABLE_CTRLC) && \ #if defined(CONFIG_CONSOLE_DISABLE_CTRLC) && \
defined(CONFIG_BOOTDELAY) && (CONFIG_BOOTDELAY <= 0) defined(CONFIG_BOOTDELAY) && (CONFIG_BOOTDELAY <= 0)
case HK_CLI_OS_PRE: case HK_CLI_OS_PRE: