Switch to defconfig version of TrustZone nodes remove.
Signed-off-by: Svyatoslav Ryhel clamor95@gmail.com --- board/asus/grouper/grouper.c | 12 ------------ board/asus/transformer-t30/transformer-t30.c | 12 ------------ board/htc/endeavoru/endeavoru.c | 12 ------------ board/lg/x3-t30/x3-t30.c | 4 ---- configs/endeavoru_defconfig | 2 +- configs/grouper_common_defconfig | 2 +- configs/transformer_t30_defconfig | 2 +- configs/x3_t30_defconfig | 1 + 8 files changed, 4 insertions(+), 43 deletions(-)
diff --git a/board/asus/grouper/grouper.c b/board/asus/grouper/grouper.c index 5398ec8b9f..3d5d175233 100644 --- a/board/asus/grouper/grouper.c +++ b/board/asus/grouper/grouper.c @@ -9,7 +9,6 @@
#include <common.h> #include <dm.h> -#include <fdt_support.h> #include <i2c.h> #include <log.h> #include <asm/arch/pinmux.h> @@ -177,14 +176,3 @@ void pin_mux_mmc(void) #endif } #endif /* MMC */ - -#if defined(CONFIG_OF_LIBFDT) && defined(CONFIG_OF_BOARD_SETUP) -int ft_board_setup(void *blob, struct bd_info *bd) -{ - /* Remove TrustZone nodes */ - fdt_del_node_and_alias(blob, "/firmware"); - fdt_del_node_and_alias(blob, "/reserved-memory/trustzone@bfe00000"); - - return 0; -} -#endif diff --git a/board/asus/transformer-t30/transformer-t30.c b/board/asus/transformer-t30/transformer-t30.c index ba795a802e..6e5f24418d 100644 --- a/board/asus/transformer-t30/transformer-t30.c +++ b/board/asus/transformer-t30/transformer-t30.c @@ -11,7 +11,6 @@
#include <common.h> #include <dm.h> -#include <fdt_support.h> #include <i2c.h> #include <log.h> #include <asm/arch/pinmux.h> @@ -151,14 +150,3 @@ void pin_mux_mmc(void) tps65911_voltage_init(); } #endif /* MMC */ - -#if defined(CONFIG_OF_LIBFDT) && defined(CONFIG_OF_BOARD_SETUP) -int ft_board_setup(void *blob, struct bd_info *bd) -{ - /* Remove TrustZone nodes */ - fdt_del_node_and_alias(blob, "/firmware"); - fdt_del_node_and_alias(blob, "/reserved-memory/trustzone@bfe00000"); - - return 0; -} -#endif diff --git a/board/htc/endeavoru/endeavoru.c b/board/htc/endeavoru/endeavoru.c index e1a0b242e2..e55f4107c8 100644 --- a/board/htc/endeavoru/endeavoru.c +++ b/board/htc/endeavoru/endeavoru.c @@ -9,7 +9,6 @@
#include <common.h> #include <dm.h> -#include <fdt_support.h> #include <i2c.h> #include <log.h> #include <asm/arch/pinmux.h> @@ -91,14 +90,3 @@ void pin_mux_mmc(void) tps80032_voltage_init(); } #endif /* MMC */ - -#if defined(CONFIG_OF_LIBFDT) && defined(CONFIG_OF_BOARD_SETUP) -int ft_board_setup(void *blob, struct bd_info *bd) -{ - /* Remove TrustZone nodes */ - fdt_del_node_and_alias(blob, "/firmware"); - fdt_del_node_and_alias(blob, "/reserved-memory/trustzone@bfe00000"); - - return 0; -} -#endif diff --git a/board/lg/x3-t30/x3-t30.c b/board/lg/x3-t30/x3-t30.c index a08e00dd87..6578567f06 100644 --- a/board/lg/x3-t30/x3-t30.c +++ b/board/lg/x3-t30/x3-t30.c @@ -156,10 +156,6 @@ int ft_board_setup(void *blob, struct bd_info *bd) fdt_find_and_setprop(blob, "/serial@70006200/bluetooth", "local-bd-address", btmacaddr, 6, 1);
- /* Remove TrustZone nodes */ - fdt_del_node_and_alias(blob, "/firmware"); - fdt_del_node_and_alias(blob, "/reserved-memory/trustzone@bfe00000"); - return 0; } #endif diff --git a/configs/endeavoru_defconfig b/configs/endeavoru_defconfig index feb481170a..cd6ec9ddca 100644 --- a/configs/endeavoru_defconfig +++ b/configs/endeavoru_defconfig @@ -13,10 +13,10 @@ CONFIG_SPL_TEXT_BASE=0x80108000 CONFIG_SYS_PROMPT="Tegra30 (Endeavoru) # " CONFIG_SPL_STACK=0x800ffffc CONFIG_TEGRA30=y +CONFIG_TEGRA_REMOVE_TZ_NODES=y CONFIG_TARGET_ENDEAVORU=y CONFIG_CMD_EBTUPDATE=y CONFIG_SYS_LOAD_ADDR=0x82000000 -CONFIG_OF_BOARD_SETUP=y CONFIG_OF_SYSTEM_SETUP=y CONFIG_BOOTDELAY=0 CONFIG_AUTOBOOT_KEYED=y diff --git a/configs/grouper_common_defconfig b/configs/grouper_common_defconfig index 36ad0980e7..42f7a11ee3 100644 --- a/configs/grouper_common_defconfig +++ b/configs/grouper_common_defconfig @@ -13,10 +13,10 @@ CONFIG_SPL_TEXT_BASE=0x80108000 CONFIG_SYS_PROMPT="Tegra30 (Grouper) # " CONFIG_SPL_STACK=0x800ffffc CONFIG_TEGRA30=y +CONFIG_TEGRA_REMOVE_TZ_NODES=y CONFIG_TARGET_GROUPER=y CONFIG_CMD_EBTUPDATE=y CONFIG_SYS_LOAD_ADDR=0x82000000 -CONFIG_OF_BOARD_SETUP=y CONFIG_OF_SYSTEM_SETUP=y CONFIG_BOOTDELAY=0 CONFIG_AUTOBOOT_KEYED=y diff --git a/configs/transformer_t30_defconfig b/configs/transformer_t30_defconfig index eaff0697bb..094b358822 100644 --- a/configs/transformer_t30_defconfig +++ b/configs/transformer_t30_defconfig @@ -13,10 +13,10 @@ CONFIG_SPL_TEXT_BASE=0x80108000 CONFIG_SYS_PROMPT="Tegra30 (Transformer) # " CONFIG_SPL_STACK=0x800ffffc CONFIG_TEGRA30=y +CONFIG_TEGRA_REMOVE_TZ_NODES=y CONFIG_TARGET_TRANSFORMER_T30=y CONFIG_CMD_EBTUPDATE=y CONFIG_SYS_LOAD_ADDR=0x82000000 -CONFIG_OF_BOARD_SETUP=y CONFIG_OF_SYSTEM_SETUP=y CONFIG_BOOTDELAY=0 CONFIG_AUTOBOOT_KEYED=y diff --git a/configs/x3_t30_defconfig b/configs/x3_t30_defconfig index 98744ec89d..bb6fbb4041 100644 --- a/configs/x3_t30_defconfig +++ b/configs/x3_t30_defconfig @@ -13,6 +13,7 @@ CONFIG_SPL_TEXT_BASE=0x80108000 CONFIG_SYS_PROMPT="Tegra30 (x3) # " CONFIG_SPL_STACK=0x800ffffc CONFIG_TEGRA30=y +CONFIG_TEGRA_REMOVE_TZ_NODES=y CONFIG_TARGET_X3_T30=y CONFIG_TEGRA_ENABLE_UARTD=y CONFIG_CMD_EBTUPDATE=y