Update support for dongshanpi.

arch/riscv/dts/Makefile

@@ -7,9 +7,14 @@ dtb-$(CONFIG_TARGET_OPENPITON_RISCV64) += openpiton-riscv64.dtb
 dtb-$(CONFIG_TARGET_SIFIVE_UNLEASHED) += hifive-unleashed-a00.dtb
 dtb-$(CONFIG_TARGET_SIFIVE_UNMATCHED) += hifive-unmatched-a00.dtb
 dtb-$(CONFIG_TARGET_SIPEED_MAIX) += k210-maix-bit.dtb
-dtb-$(TARGET_K230_CANMV) += k230_canmv.dtb
-dtb-$(TARGET_K230_CANMV_01STUDIO) += k230_canmv_01studio.dtb
-dtb-$(TARGET_K230_CANMV_DONGSHANPI) += k230_canmv_dongshanpi.dtb
+
+dtb-$(CONFIG_TARGET_K230_CANMV) += k230_canmv.dtb
+dtb-$(CONFIG_TARGET_K230_CANMV_V3P0) += k230_canmv_v3p0.dtb
+dtb-$(CONFIG_TARGET_K230_CANMV_V3P0) += k230_canmv_lckfb.dtb	# lckfb use same target.
+dtb-$(CONFIG_TARGET_K230_CANMV_01STUDIO) += k230_canmv_01studio.dtb
+dtb-$(CONFIG_TARGET_K230D_CANMV_BPI_ZERO) += k230d_canmv_bpi_zero.dtb
+dtb-$(CONFIG_TARGET_K230_CANMV_DONGSHANPI) += k230_canmv_dongshanpi_512.dtb
+dtb-$(CONFIG_TARGET_K230_CANMV_DONGSHANPI) += k230_canmv_dongshanpi_1024.dtb
 
 include $(srctree)/scripts/Makefile.dts
 

arch/riscv/dts/k230_canmv_dongshanpi.dts → arch/riscv/dts/k230_canmv_dongshanpi.dtsi

@@ -32,26 +32,9 @@
 #define BANK_VOLTAGE_IO38_IO49	 K230_MSC_3V3
 #define BANK_VOLTAGE_IO50_IO61	 K230_MSC_3V3
 #define BANK_VOLTAGE_IO62_IO63	 K230_MSC_3V3
+
 #include "k230.dtsi"
 
-/ {
-	model = "kendryte k230 canmv dongshanpi";
-	compatible = "kendryte,k230_canmv_dongshanpi";
-
-	memory@0 {
-		device_type = "memory";
-		//512MB
-		reg = <
-				0x0 0 0x0 0x20000000
-			  >;
-		//1GB
-	/*	
-		reg = <
-                                0x0 0 0x0 0x40000000
-                          >;
-	*/
-	};
-};
 
 &mmc0 {
 	1-8-v;

arch/riscv/dts/k230_canmv_dongshanpi_1024.dts

@@ -0,0 +1,13 @@
+/dts-v1/;
+#include "k230_canmv_dongshanpi.dtsi"
+
+/ {
+	model = "kendryte k230 canmv dongshanpi 1GiB";
+	compatible = "kendryte,k230_canmv_dongshanpi";
+
+	memory@0 {
+		device_type = "memory";
+		//1GB
+		reg = <0x0 0 0x0 0x40000000>;
+	};
+};

arch/riscv/dts/k230_canmv_dongshanpi_512.dts

@@ -0,0 +1,13 @@
+/dts-v1/;
+#include "k230_canmv_dongshanpi.dtsi"
+
+/ {
+	model = "kendryte k230 canmv dongshanpi 512MiB";
+	compatible = "kendryte,k230_canmv_dongshanpi";
+
+	memory@0 {
+		device_type = "memory";
+		//512MB
+		reg = <0x0 0 0x0 0x20000000>;
+	};
+};

board/kendryte/common/k230_boot.c

@@ -157,7 +157,7 @@ __weak ulong get_blk_start_by_boot_firmre_type(en_boot_sys_t sys) {
     blk_s = RTT_SYS_IN_IMG_OFF_SEC;
     break;
   case BOOT_SYS_UBOOT:
-    blk_s = CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR;
+    blk_s = UBOOT_SYS_IN_IMG_OFF_SEC;
     break;
   default:
     break;

board/kendryte/k230_canmv_dongshanpi/board.c

@@ -30,8 +30,6 @@ int ddr_init_training(void)
 }
 
 int board_early_init_f(void) {
-  /* force set boot medium to sdio0 */
-  g_boot_medium = BOOT_MEDIUM_SDIO0;
   return 0;
 }
 

configs/k230_canmv_dongshanpi__1024_defconfig

@@ -0,0 +1,112 @@
+CONFIG_RISCV=y
+CONFIG_SYS_TEXT_BASE=0x8000000
+CONFIG_SYS_MALLOC_F_LEN=0x40000
+CONFIG_NR_DRAM_BANKS=3
+CONFIG_ENV_SIZE=0x10000
+CONFIG_ENV_OFFSET=0x1e0000
+CONFIG_SPL_DM_SPI=y
+CONFIG_DEFAULT_DEVICE_TREE="k230_canmv_dongshanpi_1024"
+CONFIG_SPL_TEXT_BASE=0x80300000
+CONFIG_SYS_PROMPT="K230# "
+CONFIG_SPL_MMC=y
+CONFIG_SPL_SYS_MALLOC_F_LEN=0x30000
+CONFIG_SPL_SIZE_LIMIT=0x80000
+CONFIG_SPL=y
+CONFIG_SPL_SPI_FLASH_SUPPORT=y
+CONFIG_SPL_SPI=y
+CONFIG_SYS_LOAD_ADDR=0xc000000
+CONFIG_BUILD_TARGET="u-boot.bin"
+CONFIG_TARGET_K230_CANMV_DONGSHANPI=y
+CONFIG_ARCH_RV64I=y
+# CONFIG_SPL_SMP is not set
+CONFIG_SHOW_REGS=y
+CONFIG_SYS_MEMTEST_END=0x100000
+CONFIG_CC_OPTIMIZE_FOR_DEBUG=y
+CONFIG_DISTRO_DEFAULTS=y
+CONFIG_FIT=y
+CONFIG_TIMESTAMP=y
+CONFIG_FIT_SIGNATURE=y
+CONFIG_SPL_FIT=y
+# CONFIG_SPL_LOAD_FIT is not set
+CONFIG_LEGACY_IMAGE_FORMAT=y
+CONFIG_BOOTDELAY=5
+CONFIG_LOGLEVEL=7
+CONFIG_SYS_STDIO_DEREGISTER=y
+# CONFIG_SYS_DEVICE_NULLDEV is not set
+CONFIG_DISPLAY_CPUINFO=y
+CONFIG_DISPLAY_BOARDINFO=y
+CONFIG_BOARD_EARLY_INIT_F=y
+CONFIG_BOARD_LATE_INIT=y
+CONFIG_SPL_MAX_SIZE=0x80000
+CONFIG_SPL_BSS_START_ADDR=0x80380000
+CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_USE_SECTOR=y
+CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR=0x1000
+CONFIG_SPL_ENV_SUPPORT=y
+CONFIG_SPL_MMC_WRITE=y
+CONFIG_SPL_MTD_SUPPORT=y
+CONFIG_SPL_NAND_SUPPORT=y
+CONFIG_SPL_DM_SPI_FLASH=y
+# CONFIG_SPL_SPI_FLASH_TINY is not set
+CONFIG_SPL_SPI_LOAD=y
+CONFIG_SYS_SPI_U_BOOT_OFFS=0x80000
+CONFIG_SPL_YMODEM_SUPPORT=y
+# CONFIG_CMD_CPU is not set
+CONFIG_CMD_BOOTMETH=y
+CONFIG_SYS_BOOTM_LEN=0x8000000
+CONFIG_CMD_ERASEENV=y
+CONFIG_CMD_MD5SUM=y
+CONFIG_MD5SUM_VERIFY=y
+CONFIG_CMD_MEMTEST=y
+CONFIG_SYS_ALT_MEMTEST=y
+CONFIG_CMD_GPT=y
+CONFIG_CMD_MMC=y
+CONFIG_CMD_MTD=y
+# CONFIG_CMD_PINMUX is not set
+CONFIG_CMD_SF_TEST=y
+CONFIG_CMD_USB=y
+# CONFIG_SPL_DOS_PARTITION is not set
+CONFIG_PARTITION_TYPE_GUID=y
+CONFIG_OF_EMBED=y
+CONFIG_ENV_IS_IN_MMC=y
+CONFIG_ENV_IS_IN_SPI_FLASH=y
+CONFIG_ENV_SECT_SIZE_AUTO=y
+CONFIG_SYS_RELOC_GD_ENV_ADDR=y
+CONFIG_PROT_UDP=y
+CONFIG_BOOTP_SERVERIP=y
+CONFIG_SPL_DM_DEVICE_REMOVE=y
+CONFIG_SPL_CLK=y
+CONFIG_DM_KEYBOARD=y
+CONFIG_MMC=y
+CONFIG_MMC_HS200_SUPPORT=y
+CONFIG_SPL_MMC_HS200_SUPPORT=y
+CONFIG_MMC_DW=y
+CONFIG_MMC_SDHCI=y
+CONFIG_MMC_SDHCI_SDMA=y
+CONFIG_MMC_SDHCI_SNPS=y
+CONFIG_DM_MTD=y
+CONFIG_MTD_SPI_NAND=y
+CONFIG_SPI_FLASH_SFDP_SUPPORT=y
+CONFIG_SPI_FLASH_SOFT_RESET=y
+CONFIG_SPI_FLASH_SOFT_RESET_ON_BOOT=y
+CONFIG_SPI_FLASH_GIGADEVICE=y
+CONFIG_SPI_FLASH_WINBOND=y
+# CONFIG_SPI_FLASH_USE_4K_SECTORS is not set
+CONFIG_SPI_FLASH_MTD=y
+CONFIG_PINCTRL=y
+CONFIG_SPL_PINCTRL=y
+CONFIG_SPL_PINCONF=y
+CONFIG_PINCTRL_SINGLE=y
+CONFIG_SYS_NS16550=y
+CONFIG_SPI=y
+CONFIG_DESIGNWARE_SPI=y
+CONFIG_USB=y
+CONFIG_USB_DWC2=y
+CONFIG_USB_HOST_ETHER=y
+CONFIG_USB_ETHER_ASIX=y
+CONFIG_USB_ETHER_ASIX88179=y
+CONFIG_USB_ETHER_MCS7830=y
+CONFIG_USB_ETHER_RTL8152=y
+CONFIG_USB_ETHER_SMSC95XX=y
+CONFIG_FAT_WRITE=y
+CONFIG_SPL_GZIP=y
+# CONFIG_EFI_LOADER is not set

configs/k230_canmv_dongshanpi_defconfig → configs/k230_canmv_dongshanpi__512_defconfig

@@ -5,7 +5,7 @@ CONFIG_NR_DRAM_BANKS=3
 CONFIG_ENV_SIZE=0x10000
 CONFIG_ENV_OFFSET=0x1e0000
 CONFIG_SPL_DM_SPI=y
-CONFIG_DEFAULT_DEVICE_TREE="k230_canmv_dongshanpi"
+CONFIG_DEFAULT_DEVICE_TREE="k230_canmv_dongshanpi_512"
 CONFIG_SPL_TEXT_BASE=0x80300000
 CONFIG_SYS_PROMPT="K230# "
 CONFIG_SPL_MMC=y

configs/k230_canmv_dongshanpi_burntool_defconfig

@@ -3,7 +3,7 @@ CONFIG_SYS_TEXT_BASE=0x80300000
 CONFIG_SYS_MALLOC_F_LEN=0x40000
 CONFIG_NR_DRAM_BANKS=2
 CONFIG_ENV_SIZE=0x10000
-CONFIG_DEFAULT_DEVICE_TREE="k230_canmv_dongshanpi"
+CONFIG_DEFAULT_DEVICE_TREE="k230_canmv_dongshanpi_512"
 CONFIG_SYS_PROMPT="K230# "
 CONFIG_SYS_LOAD_ADDR=0xc000000
 CONFIG_BUILD_TARGET="u-boot.bin"
@@ -53,6 +53,7 @@ CONFIG_CMD_DFU=y
 CONFIG_CMD_MMC=y
 CONFIG_CMD_MTD=y
 # CONFIG_CMD_PINMUX is not set
+CONFIG_CMD_KBURN=y
 # CONFIG_CMD_ECHO is not set
 # CONFIG_CMD_ITEST is not set
 # CONFIG_CMD_SOURCE is not set
@@ -74,6 +75,9 @@ CONFIG_SYS_DFU_DATA_BUF_SIZE=0x80000
 # CONFIG_GPIO is not set
 # CONFIG_I2C is not set
 # CONFIG_INPUT is not set
+CONFIG_KBURN_MMC=y
+CONFIG_KBURN_SF=y
+CONFIG_KBURN_MTD=y
 CONFIG_MMC=y
 CONFIG_MMC_HS200_SUPPORT=y
 CONFIG_MMC_DW=y