From 2444ec011163807949aec28103718540082d8b53 Mon Sep 17 00:00:00 2001 From: Piotr Dymacz Date: Sun, 14 Aug 2016 13:31:05 +0200 Subject: [PATCH] Enable iminfo command by default for all devices Since we support both types of image headers, we can enable "iminfo" command by default for all devices. Example output for image with custom TP-Link header: uboot> imi 0x9F020000 Checking image at 0x9F020000... Vendor/image name: TP-LINK Technologies ver. 1.0 Firmware version: 3.16.9 Hardware ID: 0x8410009 Whole image size: 3.8 MB (3932160 bytes) Kernel size: 706.1 kB (723022 bytes) Rootfs size: 2.8 MB (2883584 bytes) Kernel load address: 0x80002000 Kernel entry point: 0x801856F0 Header CRC... skipped Data CRC... skipped And for default U-Boot image header (Multi-File image here): uboot> imi 0x9FE80000 Checking image at 0x9FE80000... Image name: MIPS OpenWrt Linux-3.3.8 Build date: 2015-10-22 03:41:11 UTC Architecture: MIPS OS/image type: Linux Multi-File Compression: LZMA Data size: 1 MB (1090582 bytes) Load address: 0x80060000 Entry point: 0x80060000 Multi-Image: > 1 MB (1090574 bytes) Header CRC... OK! Data CRC... OK! --- u-boot/include/configs/ap121.h | 21 +-------------- u-boot/include/configs/ap143.h | 49 ++++++++++------------------------ u-boot/include/configs/db12x.h | 1 + 3 files changed, 16 insertions(+), 55 deletions(-) diff --git a/u-boot/include/configs/ap121.h b/u-boot/include/configs/ap121.h index 10f30ed..8405175 100644 --- a/u-boot/include/configs/ap121.h +++ b/u-boot/include/configs/ap121.h @@ -395,26 +395,6 @@ CFG_CMD_ITEST | \ CFG_CMD_IMI) -#elif defined(CONFIG_FOR_8DEVICES_CARAMBOLA2) || \ - defined(CONFIG_FOR_DRAGINO_V2) || \ - defined(CONFIG_FOR_MESH_POTATO_V2) || \ - defined(CONFIG_FOR_BLACK_SWIFT_BOARD) - - #define CONFIG_COMMANDS (CFG_CMD_MEMORY | \ - CFG_CMD_DHCP | \ - CFG_CMD_PING | \ - CFG_CMD_FLASH | \ - CFG_CMD_NET | \ - CFG_CMD_RUN | \ - CFG_CMD_DATE | \ - CFG_CMD_SNTP | \ - CFG_CMD_ECHO | \ - CFG_CMD_BOOTD | \ - CFG_CMD_ITEST | \ - CFG_CMD_IMI | \ - CFG_CMD_ENV | \ - CFG_CMD_LOADB) - #else #define CONFIG_COMMANDS (CFG_CMD_MEMORY | \ @@ -428,6 +408,7 @@ CFG_CMD_ECHO | \ CFG_CMD_BOOTD | \ CFG_CMD_ITEST | \ + CFG_CMD_IMI | \ CFG_CMD_ENV | \ CFG_CMD_LOADB) diff --git a/u-boot/include/configs/ap143.h b/u-boot/include/configs/ap143.h index cb76b82..03baa30 100644 --- a/u-boot/include/configs/ap143.h +++ b/u-boot/include/configs/ap143.h @@ -188,41 +188,20 @@ /* * Available commands */ -#if defined(CONFIG_FOR_TPLINK_WR820N_CN) ||\ - defined(CONFIG_FOR_TPLINK_WR802N) ||\ - defined(CONFIG_FOR_TPLINK_WR841N_V9) - #define CONFIG_COMMANDS (CFG_CMD_MEMORY | \ - CFG_CMD_DHCP | \ - CFG_CMD_PING | \ - CFG_CMD_FLASH | \ - CFG_CMD_NET | \ - CFG_CMD_RUN | \ - CFG_CMD_DATE | \ - CFG_CMD_SNTP | \ - CFG_CMD_ECHO | \ - CFG_CMD_BOOTD | \ - CFG_CMD_ITEST | \ - CFG_CMD_ENV | \ - CFG_CMD_LOADB) - -#elif defined(CONFIG_FOR_WALLYS_DR531) - - #define CONFIG_COMMANDS (CFG_CMD_MEMORY | \ - CFG_CMD_DHCP | \ - CFG_CMD_PING | \ - CFG_CMD_FLASH | \ - CFG_CMD_NET | \ - CFG_CMD_RUN | \ - CFG_CMD_DATE | \ - CFG_CMD_SNTP | \ - CFG_CMD_ECHO | \ - CFG_CMD_BOOTD | \ - CFG_CMD_ITEST | \ - CFG_CMD_IMI | \ - CFG_CMD_ENV | \ - CFG_CMD_LOADB) - -#endif +#define CONFIG_COMMANDS (CFG_CMD_MEMORY | \ + CFG_CMD_DHCP | \ + CFG_CMD_PING | \ + CFG_CMD_FLASH | \ + CFG_CMD_NET | \ + CFG_CMD_RUN | \ + CFG_CMD_DATE | \ + CFG_CMD_SNTP | \ + CFG_CMD_ECHO | \ + CFG_CMD_BOOTD | \ + CFG_CMD_ITEST | \ + CFG_CMD_IMI | \ + CFG_CMD_ENV | \ + CFG_CMD_LOADB) // Enable NetConsole and custom NetConsole port #define CONFIG_NETCONSOLE diff --git a/u-boot/include/configs/db12x.h b/u-boot/include/configs/db12x.h index dd2837c..79890b1 100644 --- a/u-boot/include/configs/db12x.h +++ b/u-boot/include/configs/db12x.h @@ -186,6 +186,7 @@ CFG_CMD_ECHO | \ CFG_CMD_BOOTD | \ CFG_CMD_ITEST | \ + CFG_CMD_IMI | \ CFG_CMD_ENV | \ CFG_CMD_LOADB) -- 2.25.1