On Thu, Nov 16, 2023 at 02:16:30PM +0100, Artur Rojek wrote:
Introduce support for Conclusive WHLE-LS1046A Single Board Computer.
Co-developed-by: Jakub Klama jakub@conclusive.pl Signed-off-by: Jakub Klama jakub@conclusive.pl Signed-off-by: Artur Rojek artur@conclusive.pl
[snip]
- fdt_fixup_memory_banks(blob, base, size, 2);
- ft_cpu_setup(blob, bd);
+#ifdef CONFIG_SYS_DPAA_FMAN +#ifndef CONFIG_DM_ETH
- fdt_fixup_fman_ethernet(blob);
+#endif +#endif
DM_ETH is a must-have at this point so you can just drop the non-DM_ETH case.
[snip]
diff --git a/include/configs/whle_ls1046a.h b/include/configs/whle_ls1046a.h new file mode 100644 index 000000000000..982bf71be515 --- /dev/null +++ b/include/configs/whle_ls1046a.h
In here, please see if there's any defines that are either not required, or could be in another header (for example only needed in your board code, so a header in the board directory).
+#define QSPI_NOR_BOOTCOMMAND CONFIG_BOOTCOMMAND +#define QSPI_NAND_BOOTCOMMAND CONFIG_BOOTCOMMAND +#define SD_BOOTCOMMAND CONFIG_BOOTCOMMAND
+#undef CFG_EXTRA_ENV_SETTINGS +#define CFG_EXTRA_ENV_SETTINGS \
- "hwconfig=fsl_ddr:bank_intlv=auto\0" \
- "kernel_addr_r=0x81000000\0" \
- "kernel_size=0x07000000\0" \
- "kernel_comp_addr_r=0x88000000\0" \
- "kernel_comp_size=0x04000000\0" \
- "ramdisk_addr_r=0x90000000\0" \
- "ramdisk_size=0x08000000\0" \
- "fdt_addr_r=0x98000000\0" \
- "pxefile_addr_r=0x99000000\0" \
- "scriptaddr=0x9a000000\0" \
- "fdtfile=fsl-ls1046a-whle.dtb\0" \
- "console=ttyS0,115200\0" \
- CONFIG_MTDPARTS_DEFAULT "\0" \
- BOOTENV
Please move this to a plain text environment (see board/*/*/*.env) and move from the distro_bootcmd macros to BOOTSTD. Thanks.