ARM: tegra: convert boards to use TEGRA_PRAM

Switch boards that use CFG_PRAM to TEGRA_PRAM.

Signed-off-by: Svyatoslav Ryhel <clamor95@gmail.com>

diff --git a/board/asus/transformer-t114/Kconfig b/board/asus/transformer-t114/Kconfig
index 2560c35846eaf26b297a0badb6c4bce88f934aae..2d7630422de0336664f79a0f747a3c74e32fdfb2 100644 (file)
--- 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 8bd7cfd87b835fc81fdead04b7ee7961821143d8..25468bb57f51adba68609e9f5b869bd355d8b5e5 100644 (file)
--- 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 bb53cc561611d2d34c595cc5a0a9010556b9c839..3e1e076986cda443bb468ac586e618c65d67f67f 100644 (file)
--- 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 3e42b5dd9a3fc3297d8b6a25c3e49ab464bf46e7..29094eeeaf457aa918110e7cc82d879782e3b235 100644 (file)
--- 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 c6d97ce3828e8e970c77140e0184edfd901fe003..65150fc7fbf0ecad16d40afa69ba9d7cba61d6b8 100644 (file)
--- 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 be3e333127b9e9200ade1865d3cd02dd5d911ec1..230081e3287f4ce5a0ca544cc782b6117e52b8a8 100644 (file)
--- 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 (file)
index 7255f31..0000000
--- 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 <clamor95@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 (file)
index afab01e..0000000
--- 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 <clamor95@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 (file)
index 2fbf341..0000000
--- 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 <clamor95@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 */