| Message ID | 20240124032602.126059-4-tim@feathertop.org |
|---|---|
| State | Accepted |
| Commit | 3da3bb9636e9fca7d96e27a9300f83fb5b190396 |
| Delegated to: | Kever Yang |
| Headers | show |
| Series | rockchip: Add support for rv1126 based Sonoff iHost Gateway | expand |
On 2024/1/24 11:25, Tim Lunn wrote: > 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> Thanks, - Kever > > --- > > Changes in v2: > - New patch to clean up distro boot from rv1126_common.h > > include/configs/neural-compute-module-2.h | 6 ------ > include/configs/rv1126_common.h | 3 +-- > 2 files changed, 1 insertion(+), 8 deletions(-) > > diff --git a/include/configs/neural-compute-module-2.h b/include/configs/neural-compute-module-2.h > index f0934ae00c..43a560906a 100644 > --- 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 a64c0c6364..168cd8b167 100644 > --- 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 */
diff --git a/include/configs/neural-compute-module-2.h b/include/configs/neural-compute-module-2.h index f0934ae00c..43a560906a 100644 --- 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 a64c0c6364..168cd8b167 100644 --- 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 */
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/ --- Changes in v2: - New patch to clean up distro boot from rv1126_common.h include/configs/neural-compute-module-2.h | 6 ------ include/configs/rv1126_common.h | 3 +-- 2 files changed, 1 insertion(+), 8 deletions(-)