From 46683f3da191a4c2156d5473c23b9923c461912c Mon Sep 17 00:00:00 2001 From: Kever Yang Date: Fri, 22 Jul 2016 17:22:50 +0800 Subject: mmc-uclass: correct the device number Not like the mmc-legacy which the devnum starts from 1, it starts from 0 in mmc-uclass, so the device number should be (devnum + 1) in get_mmc_num(). Signed-off-by: Kever Yang Acked-by: Simon Glass Reviewed-by: Jaehoon Chung --- include/mmc.h | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'include') diff --git a/include/mmc.h b/include/mmc.h index 8f309f1f71..dd47f34e9d 100644 --- a/include/mmc.h +++ b/include/mmc.h @@ -503,6 +503,12 @@ void mmc_set_clock(struct mmc *mmc, uint clock); struct mmc *find_mmc_device(int dev_num); int mmc_set_dev(int dev_num); void print_mmc_devices(char separator); + +/** + * get_mmc_num() - get the total MMC device number + * + * @return 0 if there is no MMC device, else the number of devices + */ int get_mmc_num(void); int mmc_hwpart_config(struct mmc *mmc, const struct mmc_hwpart_conf *conf, enum mmc_hwpart_conf_mode mode); -- cgit From 22948e1015140913b47b2886cfb08322b2538849 Mon Sep 17 00:00:00 2001 From: Kever Yang Date: Fri, 22 Jul 2016 17:41:37 +0800 Subject: configs: rockchip: remove no use MACRO The CONFIG_ROCKCHIP_COMMON and CONFIG_SPL_ROCKCHIP_COMMON are no use now, remove them. Signed-off-by: Kever Yang Acked-by: Simon Glass --- include/configs/rk3036_common.h | 2 -- include/configs/rk3288_common.h | 3 --- 2 files changed, 5 deletions(-) (limited to 'include') diff --git a/include/configs/rk3036_common.h b/include/configs/rk3036_common.h index ae4b101e44..b003baac29 100644 --- a/include/configs/rk3036_common.h +++ b/include/configs/rk3036_common.h @@ -40,8 +40,6 @@ #define CONFIG_ROCKCHIP_MAX_INIT_SIZE (4 << 10) #define CONFIG_ROCKCHIP_CHIP_TAG "RK30" -#define CONFIG_ROCKCHIP_COMMON - /* MMC/SD IP block */ #define CONFIG_MMC #define CONFIG_GENERIC_MMC diff --git a/include/configs/rk3288_common.h b/include/configs/rk3288_common.h index 2a36c1706b..be6dba0ad2 100644 --- a/include/configs/rk3288_common.h +++ b/include/configs/rk3288_common.h @@ -44,9 +44,6 @@ #define CONFIG_SPL_STACK 0xff718000 #define CONFIG_SPL_TEXT_BASE 0xff704004 -#define CONFIG_ROCKCHIP_COMMON -#define CONFIG_SPL_ROCKCHIP_COMMON - #define CONFIG_SILENT_CONSOLE #ifndef CONFIG_SPL_BUILD # define CONFIG_SYS_CONSOLE_IS_IN_ENV -- cgit From 1743d0bafc5ffc36ba8993badf0ba687e126e189 Mon Sep 17 00:00:00 2001 From: "jk.kernel@gmail.com" Date: Tue, 26 Jul 2016 18:28:24 +0800 Subject: rockchip: rk3288: disable fastboot in SPL stage Reduce compilation time for SPL. Signed-off-by: Ziyuan Xu Acked-by: Simon Glass --- include/configs/rk3288_common.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'include') diff --git a/include/configs/rk3288_common.h b/include/configs/rk3288_common.h index be6dba0ad2..9f2dd3fea3 100644 --- a/include/configs/rk3288_common.h +++ b/include/configs/rk3288_common.h @@ -81,6 +81,7 @@ #define CONFIG_SPI #define CONFIG_SF_DEFAULT_SPEED 20000000 +#ifndef CONFIG_SPL_BUILD /* usb otg */ #define CONFIG_USB_GADGET #define CONFIG_USB_GADGET_DUALSPEED @@ -107,7 +108,6 @@ #define CONFIG_CMD_GPT #define CONFIG_EFI_PARTITION -#ifndef CONFIG_SPL_BUILD #include #define ENV_MEM_LAYOUT_SETTINGS \ -- cgit From 77337c1c7a0d5e2bc15db4c6d237550c8af26942 Mon Sep 17 00:00:00 2001 From: "jk.kernel@gmail.com" Date: Tue, 26 Jul 2016 18:28:25 +0800 Subject: rockchip: remove the duplicated macro config CONFIG_DOS_PARTITION and CONFIG_EFI_PARTITION are already included in config_distro_defaults.h, and we don't need them in SPL stage. Signed-off-by: Ziyuan Xu Acked-by: Simon Glass --- include/configs/kylin_rk3036.h | 1 - include/configs/rk3036_common.h | 1 - include/configs/rk3288_common.h | 2 -- 3 files changed, 4 deletions(-) (limited to 'include') diff --git a/include/configs/kylin_rk3036.h b/include/configs/kylin_rk3036.h index b16c03fc0a..e8ca76dfcf 100644 --- a/include/configs/kylin_rk3036.h +++ b/include/configs/kylin_rk3036.h @@ -26,7 +26,6 @@ /* Enable gpt partition table */ #define CONFIG_CMD_GPT #define CONFIG_RANDOM_UUID -#define CONFIG_EFI_PARTITION #define PARTS_DEFAULT \ "uuid_disk=${uuid_gpt_disk};" \ "name=loader,start=32K,size=4000K,uuid=${uuid_gpt_loader};" \ diff --git a/include/configs/rk3036_common.h b/include/configs/rk3036_common.h index b003baac29..ffcaa6f0e5 100644 --- a/include/configs/rk3036_common.h +++ b/include/configs/rk3036_common.h @@ -46,7 +46,6 @@ #define CONFIG_DWMMC #define CONFIG_BOUNCE_BUFFER -#define CONFIG_DOS_PARTITION #define CONFIG_FAT_WRITE #define CONFIG_PARTITION_UUIDS #define CONFIG_CMD_PART diff --git a/include/configs/rk3288_common.h b/include/configs/rk3288_common.h index 9f2dd3fea3..0b7d7234ee 100644 --- a/include/configs/rk3288_common.h +++ b/include/configs/rk3288_common.h @@ -56,7 +56,6 @@ #define CONFIG_DWMMC #define CONFIG_BOUNCE_BUFFER -#define CONFIG_DOS_PARTITION #define CONFIG_FAT_WRITE #define CONFIG_PARTITION_UUIDS #define CONFIG_CMD_PART @@ -106,7 +105,6 @@ /* Enable gpt partition table */ #define CONFIG_CMD_GPT -#define CONFIG_EFI_PARTITION #include -- cgit From f75711aae72e6331fc5bb6c6b094869182fb200c Mon Sep 17 00:00:00 2001 From: "jk.kernel@gmail.com" Date: Tue, 26 Jul 2016 18:28:26 +0800 Subject: rockchip: rk3288: revise CONFIG_FASTBOOT_BUF_ADDR CONFIG_SYS_LOAD_ADDR is absolutely safe to store image for fastboot. Signed-off-by: Ziyuan Xu Acked-by: Simon Glass --- include/configs/rk3288_common.h | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'include') diff --git a/include/configs/rk3288_common.h b/include/configs/rk3288_common.h index 0b7d7234ee..814116c93e 100644 --- a/include/configs/rk3288_common.h +++ b/include/configs/rk3288_common.h @@ -93,9 +93,7 @@ #define CONFIG_USB_FUNCTION_FASTBOOT #define CONFIG_FASTBOOT_FLASH #define CONFIG_FASTBOOT_FLASH_MMC_DEV 1 /* eMMC */ -/* stroe safely fastboot buffer data to the middle of bank */ -#define CONFIG_FASTBOOT_BUF_ADDR (CONFIG_SYS_SDRAM_BASE \ - + SDRAM_BANK_SIZE / 2) +#define CONFIG_FASTBOOT_BUF_ADDR CONFIG_SYS_LOAD_ADDR #define CONFIG_FASTBOOT_BUF_SIZE 0x08000000 #define CONFIG_USB_GADGET_DOWNLOAD -- cgit From cba6bb1b74133060207192fba55e650d5744ed39 Mon Sep 17 00:00:00 2001 From: "jk.kernel@gmail.com" Date: Tue, 26 Jul 2016 18:28:27 +0800 Subject: rockchip: rk3288: move evb board to rockchip folder The 'evb-rk3288' is not a vendor name, change it to 'rockchip' which is the real vendor name. Signed-off-by: Ziyuan Xu Acked-by: Simon Glass --- include/configs/evb-rk3288.h | 26 -------------------------- include/configs/evb_rk3288.h | 26 ++++++++++++++++++++++++++ 2 files changed, 26 insertions(+), 26 deletions(-) delete mode 100644 include/configs/evb-rk3288.h create mode 100644 include/configs/evb_rk3288.h (limited to 'include') diff --git a/include/configs/evb-rk3288.h b/include/configs/evb-rk3288.h deleted file mode 100644 index 342557fff3..0000000000 --- a/include/configs/evb-rk3288.h +++ /dev/null @@ -1,26 +0,0 @@ -/* - * (C) Copyright 2016 Rockchip Electronics Co., Ltd - * - * SPDX-License-Identifier: GPL-2.0+ - */ - -#ifndef __CONFIG_H -#define __CONFIG_H - -#define ROCKCHIP_DEVICE_SETTINGS -#include - -#define CONFIG_SPL_MMC_SUPPORT - -#define CONFIG_ENV_IS_IN_MMC -#define CONFIG_SYS_MMC_ENV_DEV 1 -/* SPL @ 32k for ~36k - * ENV @ 96k - * u-boot @ 128K - */ -#define CONFIG_ENV_OFFSET (96 * 1024) - -#define CONFIG_SYS_WHITE_ON_BLACK -#define CONFIG_CONSOLE_SCROLL_LINES 10 - -#endif diff --git a/include/configs/evb_rk3288.h b/include/configs/evb_rk3288.h new file mode 100644 index 0000000000..342557fff3 --- /dev/null +++ b/include/configs/evb_rk3288.h @@ -0,0 +1,26 @@ +/* + * (C) Copyright 2016 Rockchip Electronics Co., Ltd + * + * SPDX-License-Identifier: GPL-2.0+ + */ + +#ifndef __CONFIG_H +#define __CONFIG_H + +#define ROCKCHIP_DEVICE_SETTINGS +#include + +#define CONFIG_SPL_MMC_SUPPORT + +#define CONFIG_ENV_IS_IN_MMC +#define CONFIG_SYS_MMC_ENV_DEV 1 +/* SPL @ 32k for ~36k + * ENV @ 96k + * u-boot @ 128K + */ +#define CONFIG_ENV_OFFSET (96 * 1024) + +#define CONFIG_SYS_WHITE_ON_BLACK +#define CONFIG_CONSOLE_SCROLL_LINES 10 + +#endif -- cgit From d7ca67b7cdd67f79637a8a0097277a68294fa3d8 Mon Sep 17 00:00:00 2001 From: "jk.kernel@gmail.com" Date: Tue, 26 Jul 2016 18:28:29 +0800 Subject: rockchip: add basic support for fennec-rk3288 board Fennec is a RK3288-based development board with 2 USB ports, HDMI, micro-SD card, audio and WiFi and Gigabit Ethernet. It also includes on-board 8GB eMMC and 2GB of SDRAM. Expansion connectors provides access to display pins, I2C, SPI, UART and GPIOs. Signed-off-by: Ziyuan Xu Acked-by: Simon Glass --- include/configs/fennec_rk3288.h | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) create mode 100644 include/configs/fennec_rk3288.h (limited to 'include') diff --git a/include/configs/fennec_rk3288.h b/include/configs/fennec_rk3288.h new file mode 100644 index 0000000000..342557fff3 --- /dev/null +++ b/include/configs/fennec_rk3288.h @@ -0,0 +1,26 @@ +/* + * (C) Copyright 2016 Rockchip Electronics Co., Ltd + * + * SPDX-License-Identifier: GPL-2.0+ + */ + +#ifndef __CONFIG_H +#define __CONFIG_H + +#define ROCKCHIP_DEVICE_SETTINGS +#include + +#define CONFIG_SPL_MMC_SUPPORT + +#define CONFIG_ENV_IS_IN_MMC +#define CONFIG_SYS_MMC_ENV_DEV 1 +/* SPL @ 32k for ~36k + * ENV @ 96k + * u-boot @ 128K + */ +#define CONFIG_ENV_OFFSET (96 * 1024) + +#define CONFIG_SYS_WHITE_ON_BLACK +#define CONFIG_CONSOLE_SCROLL_LINES 10 + +#endif -- cgit From dd63fbc70a5fa59677c86695ebad341834fec172 Mon Sep 17 00:00:00 2001 From: "jk.kernel@gmail.com" Date: Tue, 26 Jul 2016 18:28:30 +0800 Subject: rockchip: add support for rk3288 PopMetal board PopMetal is a rockchip rk3288 based board made by ChipSpark, which has many interface such as HDMI, VGA, USB, micro-SD card, WiFi, Audio and Gigabit Ethernet. Signed-off-by: Ziyuan Xu Acked-by: Simon Glass --- include/configs/popmetal_rk3288.h | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) create mode 100644 include/configs/popmetal_rk3288.h (limited to 'include') diff --git a/include/configs/popmetal_rk3288.h b/include/configs/popmetal_rk3288.h new file mode 100644 index 0000000000..342557fff3 --- /dev/null +++ b/include/configs/popmetal_rk3288.h @@ -0,0 +1,26 @@ +/* + * (C) Copyright 2016 Rockchip Electronics Co., Ltd + * + * SPDX-License-Identifier: GPL-2.0+ + */ + +#ifndef __CONFIG_H +#define __CONFIG_H + +#define ROCKCHIP_DEVICE_SETTINGS +#include + +#define CONFIG_SPL_MMC_SUPPORT + +#define CONFIG_ENV_IS_IN_MMC +#define CONFIG_SYS_MMC_ENV_DEV 1 +/* SPL @ 32k for ~36k + * ENV @ 96k + * u-boot @ 128K + */ +#define CONFIG_ENV_OFFSET (96 * 1024) + +#define CONFIG_SYS_WHITE_ON_BLACK +#define CONFIG_CONSOLE_SCROLL_LINES 10 + +#endif -- cgit