rockchip: Convert rv1126 to standard boot

RV1126 soc appears to have been missed with the conversion of
rockchip socs to standard boot.

Remove remnants of distro boot for rv1126 common and the one
existing board.

Signed-off-by: Tim Lunn <tim@feathertop.org>
Link: https://lore.kernel.org/all/20230407223645.v8.8.I4cf7708a1ba953b9abd81375d93af34665c7b251@changeid/
Reviewed-by: Kever Yang <kever.yang@rock-chips.com>

diff --git a/include/configs/neural-compute-module-2.h b/include/configs/neural-compute-module-2.h
index f0934ae00c7c2f03cab3a6fc83699b14c9277bf4..43a560906a54383d9dc6b9a24706f395da31ab6a 100644 (file)
--- a/include/configs/neural-compute-module-2.h
+++ b/include/configs/neural-compute-module-2.h
@@ -12,10 +12,4 @@
 
 #include <configs/rv1126_common.h>
 
-#undef BOOT_TARGET_DEVICES
-
-#define BOOT_TARGET_DEVICES(func) \
-       func(MMC, mmc, 0) \
-       func(MMC, mmc, 1)
-
 #endif /* __NEURAL_COMPUTE_MODULE_2_H */

diff --git a/include/configs/rv1126_common.h b/include/configs/rv1126_common.h
index a64c0c63642e93f092c934679a1113fdd90ee5be..168cd8b1673ea2b848e509f7ac2952e859eff553 100644 (file)
--- a/include/configs/rv1126_common.h
+++ b/include/configs/rv1126_common.h
@@ -28,7 +28,6 @@
        "kernel_addr_r=0x02008000\0" \
        "ramdisk_addr_r=0x0a200000\0"
 
-#include <config_distro_bootcmd.h>
 #define CFG_EXTRA_ENV_SETTINGS \
        "fdt_high=0x0fffffff\0" \
        "initrd_high=0x0fffffff\0" \
@@ -36,6 +35,6 @@
        "partitions=" PARTS_DEFAULT \
        ENV_MEM_LAYOUT_SETTINGS  \
        ROCKCHIP_DEVICE_SETTINGS \
-       BOOTENV
+       "boot_targets=" BOOT_TARGETS "\0"
 
 #endif /* __CONFIG_RV1126_COMMON_H */