From d5d88d949f515f366e158b86f013516bdaccbdab Mon Sep 17 00:00:00 2001 From: Andy Yan Date: Tue, 29 May 2018 10:58:41 +0800 Subject: [PATCH] rockchip: rv1108: use RKIMG_BOOTCOMMAND Boot system by bootrkp or boot_android Change-Id: Ieea7aa778ae14a08f7c40c48a88822058a2985f5 Signed-off-by: Andy Yan --- configs/evb-rv1108_defconfig | 11 ++++++----- include/configs/evb_rv1108.h | 18 +++++------------- include/configs/rv1108_common.h | 17 +++++++++++++++++ 3 files changed, 28 insertions(+), 18 deletions(-) diff --git a/configs/evb-rv1108_defconfig b/configs/evb-rv1108_defconfig index ab5b68954a..53838f5638 100644 --- a/configs/evb-rv1108_defconfig +++ b/configs/evb-rv1108_defconfig @@ -6,6 +6,7 @@ CONFIG_SPL_LIBCOMMON_SUPPORT=y CONFIG_SPL_LIBGENERIC_SUPPORT=y CONFIG_ROCKCHIP_RV1108=y CONFIG_SPL_ROCKCHIP_BACK_TO_BROM=y +CONFIG_RKIMG_BOOTLOADER=y CONFIG_SPL_SERIAL_SUPPORT=y CONFIG_TARGET_EVB_RV1108=y CONFIG_SPL_STACK_R_ADDR=0x80000 @@ -13,15 +14,13 @@ CONFIG_DEFAULT_DEVICE_TREE="rv1108-evb" CONFIG_DEBUG_UART=y # CONFIG_DISPLAY_CPUINFO is not set CONFIG_SPL_STACK_R=y -CONFIG_FASTBOOT=y -CONFIG_USB_FUNCTION_FASTBOOT=y -CONFIG_CMD_FASTBOOT=y CONFIG_FASTBOOT_BUF_ADDR=0x62000000 CONFIG_FASTBOOT_BUF_SIZE=0x08000000 CONFIG_FASTBOOT_FLASH=y CONFIG_FASTBOOT_FLASH_MMC_DEV=1 # CONFIG_CMD_IMLS is not set CONFIG_RANDOM_UUID=y +CONFIG_CMD_BOOT_ROCKCHIP=y CONFIG_CMD_SF=y CONFIG_CMD_USB=y # CONFIG_CMD_SETEXPR is not set @@ -34,8 +33,6 @@ CONFIG_REGMAP=y CONFIG_SYSCON=y CONFIG_CLK=y CONFIG_ROCKCHIP_GPIO=y -CONFIG_PHY=y -CONFIG_PHY_ROCKCHIP_INNO_USB2=y CONFIG_SYS_I2C_ROCKCHIP=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_BAR=y @@ -45,6 +42,8 @@ CONFIG_SPI_FLASH_MTD=y CONFIG_DM_ETH=y CONFIG_ETH_DESIGNWARE=y CONFIG_GMAC_ROCKCHIP=y +CONFIG_PHY=y +CONFIG_PHY_ROCKCHIP_INNO_USB2=y CONFIG_PINCTRL=y CONFIG_DM_PMIC=y CONFIG_DM_REGULATOR_FIXED=y @@ -56,6 +55,8 @@ CONFIG_PWM_ROCKCHIP=y CONFIG_RAM=y CONFIG_SPL_RAM=y CONFIG_DM_RESET=y +CONFIG_RKFLASH=y +CONFIG_RKSFC_NOR=y CONFIG_BAUDRATE=1500000 # CONFIG_SPL_SERIAL_PRESENT is not set CONFIG_DEBUG_UART_BASE=0x10210000 diff --git a/include/configs/evb_rv1108.h b/include/configs/evb_rv1108.h index c02ce65b28..9b2a767f91 100644 --- a/include/configs/evb_rv1108.h +++ b/include/configs/evb_rv1108.h @@ -9,18 +9,10 @@ #include -/* - * Default environment settings - */ -#define CONFIG_EXTRA_ENV_SETTINGS \ - "netdev=eth0\0" \ - "ipaddr=172.16.12.50\0" \ - "serverip=172.16.12.69\0" \ - "" -#define CONFIG_BOOTCOMMAND \ - "sf probe;" \ - "sf read 0x62000000 0xc0000 0x500000;" \ - "dcache off;" \ - "go 0x62000000" +#ifndef CONFIG_SPL_BUILD + +#undef CONFIG_BOOTCOMMAND +#define CONFIG_BOOTCOMMAND RKIMG_BOOTCOMMAND +#endif #endif diff --git a/include/configs/rv1108_common.h b/include/configs/rv1108_common.h index d0afa41a99..73b75b16c7 100644 --- a/include/configs/rv1108_common.h +++ b/include/configs/rv1108_common.h @@ -37,4 +37,21 @@ /* rockchip ohci host driver */ #define CONFIG_USB_OHCI_NEW #define CONFIG_SYS_USB_OHCI_MAX_ROOT_PORTS 1 + +#ifndef CONFIG_SPL_BUILD + +#define ENV_MEM_LAYOUT_SETTINGS \ + "scriptaddr=0x60000000\0" \ + "fdt_addr_r=0x61f00000\0" \ + "kernel_addr_r=0x62000000\0" \ + "ramdisk_addr_r=0x64000000\0" + +#include +#define CONFIG_EXTRA_ENV_SETTINGS \ + ENV_MEM_LAYOUT_SETTINGS \ + "partitions=" PARTS_DEFAULT \ + RKIMG_DET_BOOTDEV \ + BOOTENV +#endif + #endif