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

rockchip: tpl: rename CONFIG_TINY_TPL to CONFIG_TPL_TINY_FRAMEWORK 

Change-Id: Ia05a73467578f5620a9ba168e67bcfb02c40e1d0
Signed-off-by: YouMin Chen <cym@rock-chips.com>
This commit is contained in:
YouMin Chen 2018-07-06 19:58:32 +08:00
parent 891b189dd2
commit ba5fd738de
9 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/arm/include/asm/arch-rockchip/sys_proto.h
View File

@ -7,7 +7,7 @@
#ifndef _ASM_ARCH_SYS_PROTO_H
#define _ASM_ARCH_SYS_PROTO_H
#if !defined(CONFIG_SPL_FRAMEWORK) || defined(CONFIG_TINY_TPL)
#if !defined(CONFIG_SPL_FRAMEWORK) || CONFIG_IS_ENABLED(TINY_FRAMEWORK)
int sdram_init(void);
#endif

8
arch/arm/mach-rockchip/tpl.c
View File

@ -71,7 +71,7 @@ __weak int arch_cpu_init(void)
void board_init_f(ulong dummy)
{
#if defined(CONFIG_SPL_FRAMEWORK) && !defined(CONFIG_TINY_TPL)
#if defined(CONFIG_SPL_FRAMEWORK) && !CONFIG_IS_ENABLED(TINY_FRAMEWORK)
struct udevice *dev;
int ret;
#endif
@ -93,7 +93,7 @@ void board_init_f(ulong dummy)
U_BOOT_TIME ")\n");
#endif
#if defined(CONFIG_SPL_FRAMEWORK) && !defined(CONFIG_TINY_TPL)
#if defined(CONFIG_SPL_FRAMEWORK) && !CONFIG_IS_ENABLED(TINY_FRAMEWORK)
ret = spl_early_init();
if (ret) {
debug("spl_early_init() failed: %d\n", ret);
@ -104,7 +104,7 @@ void board_init_f(ulong dummy)
/* Init ARM arch timer */
timer_init();
#if defined(CONFIG_SPL_FRAMEWORK) && !defined(CONFIG_TINY_TPL)
#if defined(CONFIG_SPL_FRAMEWORK) && !CONFIG_IS_ENABLED(TINY_FRAMEWORK)
ret = uclass_get_device(UCLASS_RAM, 0, &dev);
if (ret) {
printf("DRAM init failed: %d\n", ret);
@ -119,7 +119,7 @@ void board_init_f(ulong dummy)
#endif
}
#if !(defined(CONFIG_SPL_FRAMEWORK) && !defined(CONFIG_TINY_TPL))
#if !(defined(CONFIG_SPL_FRAMEWORK) && !CONFIG_IS_ENABLED(TINY_FRAMEWORK))
/* Place Holders */
void board_init_r(gd_t *id, ulong dest_addr)
{

2
common/spl/Kconfig
View File

@ -852,7 +852,7 @@ config TPL_LIBGENERIC_SUPPORT
Enable support for generic U-Boot libraries within TPL. See
SPL_LIBGENERIC_SUPPORT for details.
config TINY_TPL
config TPL_TINY_FRAMEWORK
bool "Support not to use spl framework in TPL"
help
Enable support for not using spl framework in TPL, to reduce the TPL size.

2
common/spl/Makefile
View File

@ -9,7 +9,7 @@
#
ifeq ($(CONFIG_TPL_BUILD), y)
ifndef CONFIG_TINY_TPL
ifndef CONFIG_TPL_TINY_FRAMEWORK
obj-$(CONFIG_SPL_FRAMEWORK) += spl.o
endif
else

1
configs/evb-rk3036_defconfig
View File

@ -28,6 +28,7 @@ CONFIG_SPL_STACK_R=y
CONFIG_SPL_STACK_R_MALLOC_SIMPLE_LEN=0x2000
CONFIG_SPL_OPTEE_SUPPORT=y
CONFIG_SPL_OPTEE=y
CONFIG_TPL_TINY_FRAMEWORK=y
CONFIG_TPL_SERIAL_SUPPORT=y
CONFIG_FASTBOOT_BUF_SIZE=0x04000000
CONFIG_FASTBOOT_FLASH=y

1
configs/kylin-rk3036_defconfig
View File

@ -28,6 +28,7 @@ CONFIG_SPL_STACK_R=y
CONFIG_SPL_STACK_R_MALLOC_SIMPLE_LEN=0x2000
CONFIG_SPL_OPTEE_SUPPORT=y
CONFIG_SPL_OPTEE=y
CONFIG_TPL_TINY_FRAMEWORK=y
CONFIG_TPL_SERIAL_SUPPORT=y
CONFIG_FASTBOOT_BUF_SIZE=0x04000000
CONFIG_FASTBOOT_FLASH=y

1
include/configs/rk3036_common.h
View File

@ -14,7 +14,6 @@
#define CONFIG_SKIP_LOWLEVEL_INIT
#define CONFIG_SYS_BOOTM_LEN (64 << 20) /* 64M */
#define CONFIG_TINY_TPL
#define CONFIG_SPL_FRAMEWORK
#define CONFIG_SYS_NS16550_SERIAL

2
scripts/Makefile.spl
View File

@ -65,7 +65,7 @@ libs-y += $(if $(BOARDDIR),board/$(BOARDDIR)/)
libs-$(HAVE_VENDOR_COMMON_LIB) += board/$(VENDOR)/common/
ifeq ($(CONFIG_TPL_BUILD),y)
ifndef CONFIG_TINY_TPL
ifndef CONFIG_TPL_TINY_FRAMEWORK
libs-$(CONFIG_SPL_FRAMEWORK) += common/spl/
endif
else

2
scripts/config_whitelist.txt
View File

@ -4870,9 +4870,9 @@ CONFIG_TIZEN
CONFIG_TI_KEYSTONE_SERDES
CONFIG_TI_KSNAV
CONFIG_TI_SPI_MMAP
CONFIG_TINY_TPL
CONFIG_TMU_TIMER
CONFIG_TPL_PAD_TO
CONFIG_TPL_TINY_FRAMEWORK
CONFIG_TPM_TIS_BASE_ADDRESS
CONFIG_TPS6586X_POWER
CONFIG_TQM834X