Switch boards that use CFG_PRAM to TEGRA_PRAM. Signed-off-by: Svyatoslav Ryhel <clamo...@gmail.com> --- board/asus/transformer-t114/Kconfig | 6 +++++- board/nvidia/tegratab/Kconfig | 6 +++++- board/xiaomi/mocha/Kconfig | 6 +++++- doc/board/asus/transformer_t114.rst | 2 +- doc/board/nvidia/tegratab.rst | 2 +- doc/board/xiaomi/mocha.rst | 2 +- include/configs/mocha.h | 19 ------------------- include/configs/tegratab.h | 19 ------------------- include/configs/transformer-t114.h | 19 ------------------- 9 files changed, 18 insertions(+), 63 deletions(-) delete mode 100644 include/configs/mocha.h delete mode 100644 include/configs/tegratab.h delete mode 100644 include/configs/transformer-t114.h
diff --git a/board/asus/transformer-t114/Kconfig b/board/asus/transformer-t114/Kconfig index 2560c35846e..2d7630422de 100644 --- a/board/asus/transformer-t114/Kconfig +++ b/board/asus/transformer-t114/Kconfig @@ -7,10 +7,14 @@ config SYS_VENDOR default "asus" config SYS_CONFIG_NAME - default "transformer-t114" + default "tegra" config TEGRA_BOARD_STRING string "Default Tegra board name" default "ASUS Transformer T114" +config TEGRA_PRAM_SIZE + depends on TEGRA_PRAM + default 0x20000 + endif diff --git a/board/nvidia/tegratab/Kconfig b/board/nvidia/tegratab/Kconfig index 8bd7cfd87b8..25468bb57f5 100644 --- a/board/nvidia/tegratab/Kconfig +++ b/board/nvidia/tegratab/Kconfig @@ -7,10 +7,14 @@ config SYS_VENDOR default "nvidia" config SYS_CONFIG_NAME - default "tegratab" + default "tegra" config TEGRA_BOARD_STRING string "Default Tegra board name" default "NVIDIA TegraTab" +config TEGRA_PRAM_SIZE + depends on TEGRA_PRAM + default 0x21c00 + endif diff --git a/board/xiaomi/mocha/Kconfig b/board/xiaomi/mocha/Kconfig index bb53cc56161..3e1e076986c 100644 --- a/board/xiaomi/mocha/Kconfig +++ b/board/xiaomi/mocha/Kconfig @@ -7,10 +7,14 @@ config SYS_VENDOR default "xiaomi" config SYS_CONFIG_NAME - default "mocha" + default "tegra" config TEGRA_BOARD_STRING string "Default Tegra board name" default "Xiaomi Mocha" +config TEGRA_PRAM_SIZE + depends on TEGRA_PRAM + default 0x38400 + endif diff --git a/doc/board/asus/transformer_t114.rst b/doc/board/asus/transformer_t114.rst index 3e42b5dd9a3..29094eeeaf4 100644 --- a/doc/board/asus/transformer_t114.rst +++ b/doc/board/asus/transformer_t114.rst @@ -36,7 +36,7 @@ To build U-Boot without SPL adjust tf701t_defconfig: CONFIG_TEXT_BASE=0x80A00000 CONFIG_SKIP_LOWLEVEL_INIT=y # CONFIG_OF_BOARD_SETUP is not set - CONFIG_TEGRA_SUPPORT_NON_SECURE=y + CONFIG_TEGRA_PRAM=y After the build succeeds, you will obtain the final ``u-boot-dtb.bin`` file, ready for booting with fastboot boot or which can be further processed into diff --git a/doc/board/nvidia/tegratab.rst b/doc/board/nvidia/tegratab.rst index c6d97ce3828..65150fc7fbf 100644 --- a/doc/board/nvidia/tegratab.rst +++ b/doc/board/nvidia/tegratab.rst @@ -36,7 +36,7 @@ To build U-Boot without SPL adjust tegratab_defconfig: CONFIG_TEXT_BASE=0x80A00000 CONFIG_SKIP_LOWLEVEL_INIT=y # CONFIG_OF_BOARD_SETUP is not set - CONFIG_TEGRA_SUPPORT_NON_SECURE=y + CONFIG_TEGRA_PRAM=y After the build succeeds, you will obtain the final ``u-boot-dtb.bin`` file, ready for booting with fastboot boot or which can be further processed into diff --git a/doc/board/xiaomi/mocha.rst b/doc/board/xiaomi/mocha.rst index be3e333127b..230081e3287 100644 --- a/doc/board/xiaomi/mocha.rst +++ b/doc/board/xiaomi/mocha.rst @@ -105,7 +105,7 @@ To build U-Boot without SPL suitable for chainloading adjust mocha_defconfig: CONFIG_TEXT_BASE=0x80A00000 CONFIG_SKIP_LOWLEVEL_INIT=y # CONFIG_OF_BOARD_SETUP is not set - CONFIG_TEGRA_SUPPORT_NON_SECURE=y + CONFIG_TEGRA_PRAM=y After the build succeeds, you will obtain the final ``u-boot-dtb.bin`` file, ready for booting using vendor bootloader's fastboot or which can be diff --git a/include/configs/mocha.h b/include/configs/mocha.h deleted file mode 100644 index 7255f31baec..00000000000 --- a/include/configs/mocha.h +++ /dev/null @@ -1,19 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0 */ -/* - * Copyright (c) 2010-2013, NVIDIA CORPORATION. All rights reserved. - * - * Copyright (c) 2024, Svyatoslav Ryhel <clamo...@gmail.com> - */ - -#ifndef __CONFIG_H -#define __CONFIG_H - -#include "tegra124-common.h" - -#ifdef CONFIG_TEGRA_SUPPORT_NON_SECURE - #define CFG_PRAM 0x38400 /* 225 MB */ -#endif - -#include "tegra-common-post.h" - -#endif /* __CONFIG_H */ diff --git a/include/configs/tegratab.h b/include/configs/tegratab.h deleted file mode 100644 index afab01ec09c..00000000000 --- a/include/configs/tegratab.h +++ /dev/null @@ -1,19 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0 */ -/* - * Copyright (c) 2010-2013, NVIDIA CORPORATION. All rights reserved. - * - * Copyright (c) 2023, Svyatoslav Ryhel <clamo...@gmail.com> - */ - -#ifndef __CONFIG_H -#define __CONFIG_H - -#include "tegra114-common.h" - -#ifdef CONFIG_TEGRA_SUPPORT_NON_SECURE - #define CFG_PRAM 0x21c00 /* 135 MB */ -#endif - -#include "tegra-common-post.h" - -#endif /* __CONFIG_H */ diff --git a/include/configs/transformer-t114.h b/include/configs/transformer-t114.h deleted file mode 100644 index 2fbf3417691..00000000000 --- a/include/configs/transformer-t114.h +++ /dev/null @@ -1,19 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0 */ -/* - * Copyright (c) 2010-2013, NVIDIA CORPORATION. All rights reserved. - * - * Copyright (c) 2023, Svyatoslav Ryhel <clamo...@gmail.com> - */ - -#ifndef __CONFIG_H -#define __CONFIG_H - -#include "tegra114-common.h" - -#ifdef CONFIG_TEGRA_SUPPORT_NON_SECURE - #define CFG_PRAM 0x20000 /* 128 MB */ -#endif - -#include "tegra-common-post.h" - -#endif /* __CONFIG_H */ -- 2.43.0