configs: fix load dtb name

Signed-off-by: Han Gao <gaohan@iscas.ac.cn>
huiwei: remove ili9881c_panel
2026-06-21 17:12:31 +02:00 · 2024-06-02 12:03:22 +08:00 · 2024-06-01 21:51:30 +08:00 · 2024-06-01 21:47:46 +08:00 · 2024-06-01 21:42:52 +08:00 · 2024-06-01 21:37:47 +08:00
120 changed files with 4406 additions and 10926 deletions
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -0,0 +1,141 @@
+name: thead-u-boot-build
+
+on:
+  push:
+    tags:
+      - '*'
+    branches:
+      - '*'
+  pull_request:
+  workflow_dispatch:
+  schedule:
+    - cron: "0 2 * * *"
+
+env:
+  xuantie_toolchain: https://occ-oss-prod.oss-cn-hangzhou.aliyuncs.com/resource//1705395627867
+  toolchain_file_name: Xuantie-900-gcc-linux-5.10.4-glibc-x86_64-V2.8.1-20240115.tar.gz
+  mainline_toolchain: https://github.com/riscv-collab/riscv-gnu-toolchain/releases/download/2024.04.12
+  mainline_toolchain_file_name: riscv64-glibc-ubuntu-22.04-gcc-nightly-2024.04.12-nightly.tar.gz
+  wget_alias: 'wget --retry-connrefused --waitretry=1 --read-timeout=20 --timeout=15 -t 0'
+  ARCH: riscv
+  CROSS_COMPILE: riscv64-unknown-linux-gnu-
+
+jobs:
+  build:
+    strategy:
+      fail-fast: false
+      matrix:
+        name: [thead-gcc, gcc-13]
+
+    runs-on: ubuntu-22.04
+
+    steps:
+      - name: Install software
+        run: |
+              sudo apt update && \
+              sudo apt install -y gdisk dosfstools g++-12-riscv64-linux-gnu build-essential \
+                                  libncurses-dev gawk flex bison openssl libssl-dev tree \
+                                  dkms libelf-dev libudev-dev libpci-dev libiberty-dev autoconf device-tree-compiler
+
+      - name: Checkout uboot
+        uses: actions/checkout@v4
+
+      - name: uboot compile
+        run: |
+              mkdir output
+              if [[ ${{ matrix.name }} = "thead-gcc" ]]; then
+                ${wget_alias} ${xuantie_toolchain}/${toolchain_file_name}
+                tar -xvf ${toolchain_file_name} -C /opt
+                export PATH="/opt/Xuantie-900-gcc-linux-5.10.4-glibc-x86_64-V2.8.1/bin:$PATH"
+              else
+                ${wget_alias} ${mainline_toolchain}/${mainline_toolchain_file_name}
+                tar -xvf ${mainline_toolchain_file_name} -C /opt
+                export PATH="/opt/riscv/bin:$PATH"
+              fi
+              ${CROSS_COMPILE}gcc -v
+
+              pushd $PWD
+                make light_lpi4a_16g_defconfig
+                make -j$(nproc)
+                find . -name "u-boot-with-spl.bin" | xargs -I{} cp -av {} ${GITHUB_WORKSPACE}/output/u-boot-with-spl-lpi4a-16g.bin
+                make clean
+                make light_lpi4a_defconfig
+                make -j$(nproc)
+                find . -name "u-boot-with-spl.bin" | xargs -I{} cp -av {} ${GITHUB_WORKSPACE}/output/u-boot-with-spl-lpi4a.bin
+                make clean
+                make light_lpi4a_console_defconfig
+                make -j$(nproc)
+                find . -name "u-boot-with-spl.bin" | xargs -I{} cp -av {} ${GITHUB_WORKSPACE}/output/u-boot-with-spl-lcon4a.bin
+                make clean
+                make light_lpi4a_console_16g_defconfig
+                make -j$(nproc)
+                find . -name "u-boot-with-spl.bin" | xargs -I{} cp -av {} ${GITHUB_WORKSPACE}/output/u-boot-with-spl-lcon4a-16g.bin
+                make clean
+                make light_lpi4a_cluster_defconfig
+                make -j$(nproc)
+                find . -name "u-boot-with-spl.bin" | xargs -I{} cp -av {} ${GITHUB_WORKSPACE}/output/u-boot-with-spl-lc4a.bin
+                make clean
+                make light_lpi4a_cluster_16g_defconfig
+                make -j$(nproc)
+                find . -name "u-boot-with-spl.bin" | xargs -I{} cp -av {} ${GITHUB_WORKSPACE}/output/u-boot-with-spl-lc4a-16g.bin
+                make clean
+                make light_beagle_defconfig
+                make -j$(nproc)
+                find . -name "u-boot-with-spl.bin" | xargs -I{} cp -av {} ${GITHUB_WORKSPACE}/output/u-boot-with-spl-beagle.bin
+                make clean
+                make light_a_val_defconfig
+                make -j$(nproc)
+                find . -name "u-boot-with-spl.bin" | xargs -I{} cp -av {} ${GITHUB_WORKSPACE}/output/u-boot-with-spl-vala.bin
+                make clean
+                make light_milkv_meles_dualrank_defconfig
+                make -j$(nproc)
+                find . -name "u-boot-with-spl.bin" | xargs -I{} cp -av {} ${GITHUB_WORKSPACE}/output/u-boot-with-spl-meles.bin
+                make clean
+                make light_milkv_meles_singlerank_defconfig
+                make -j$(nproc)
+                find . -name "u-boot-with-spl.bin" | xargs -I{} cp -av {} ${GITHUB_WORKSPACE}/output/u-boot-with-spl-meles-4g.bin
+                make clean
+                make light_huiwei_defconfig
+                make -j$(nproc)
+                find . -name "u-boot-with-spl.bin" | xargs -I{} cp -av {} ${GITHUB_WORKSPACE}/output/u-boot-with-spl-huiwei.bin
+
+                # mainline support
+                make clean
+                make light_lpi4a_defconfig
+                sed -i 's#thead/light-lpi4a.dtb#thead/th1520-lichee-pi-4a.dtb#' .config
+                make -j$(nproc)
+                find . -name "u-boot-with-spl.bin" | xargs -I{} cp -av {} ${GITHUB_WORKSPACE}/output/u-boot-with-spl-lpi4a-main.bin
+
+                make clean
+                make light_lpi4a_16g_defconfig
+                sed -i 's#thead/light-lpi4a-16gb.dtb#thead/th1520-lichee-pi-4a-16g.dtb#' .config
+                make -j$(nproc)
+                find . -name "u-boot-with-spl.bin" | xargs -I{} cp -av {} ${GITHUB_WORKSPACE}/output/u-boot-with-spl-lpi4a-16g-main.bin
+
+                make clean
+                make light_lpi4a_cluster_defconfig
+                sed -i 's#thead/light-lpi4a-cluster.dtb#thead/th1520-lichee-cluster-4a.dtb#' .config
+                make -j$(nproc)
+                find . -name "u-boot-with-spl.bin" | xargs -I{} cp -av {} ${GITHUB_WORKSPACE}/output/u-boot-with-spl-lc4a-main.bin
+
+                make clean
+                make light_lpi4a_cluster_16g_defconfig
+                sed -i 's#thead/light-lpi4a-cluster-16gb.dtb#thead/th1520-lichee-cluster-4a-16g.dtb#' .config
+                make -j$(nproc)
+                find . -name "u-boot-with-spl.bin" | xargs -I{} cp -av {} ${GITHUB_WORKSPACE}/output/u-boot-with-spl-lc4a-16g-main.bin
+              popd
+              tree ${GITHUB_WORKSPACE}/output
+
+      - name: 'Upload Artifact'
+        uses: actions/upload-artifact@v3
+        with:
+          name: thead-u-uboot-${{ matrix.name }}
+          path: output/*.bin
+          retention-days: 30
+
+      - name: 'Create release by tag'
+        uses: softprops/action-gh-release@v1
+        if: ${{ startsWith(github.ref, 'refs/tags/') && matrix.name == 'thead-gcc' }}
+        with:
+          files: output/*.bin
+          token: ${{ secrets.GITHUB_TOKEN }}
--- a/1
+++ b/1
@@ -727,7 +727,6 @@ UBOOTINCLUDE    := \
 				-I$(srctree)/arch/$(ARCH)/thumb1/include),) \
 		-I$(srctree)/arch/$(ARCH)/include \
 		$(if $(CONFIG_TARGET_LIGHT_C910), -I$(srctree)/lib/sec_library/include) \
-		$(if $(CONFIG_TARGET_LIGHT_C910), -I$(srctree)/lib/sec_library/include/soft_crypto) \
 		-include $(srctree)/include/linux/kconfig.h

 NOSTDINC_FLAGS += -nostdinc -isystem $(shell $(CC) -print-file-name=include)
--- a/arch/Kconfig
+++ b/arch/Kconfig
@@ -119,6 +119,7 @@ config SANDBOX
 	select SPI
 	select SUPPORT_OF_CONTROL
 	select SYSRESET_CMD_POWEROFF if CMD_POWEROFF
+	select SUPPORT_EXTENSION_SCAN
 	imply BITREVERSE
 	select BLOBLIST
 	imply CMD_DM
@@ -152,6 +153,7 @@ config SANDBOX
 	imply PHYLIB
 	imply DM_MDIO
 	imply DM_MDIO_MUX
+	imply CMD_EXTENSION

 config SH
 	bool "SuperH architecture"
--- a/arch/riscv/Makefile
+++ b/arch/riscv/Makefile
@@ -24,7 +24,16 @@ ifeq ($(CONFIG_CMODEL_MEDANY),y)
 	CMODEL = medany
 endif

-ARCH_FLAGS = -march=$(ARCH_BASE)$(ARCH_A)$(ARCH_C) -mabi=$(ABI) \
+RISCV_MARCH = $(ARCH_BASE)$(ARCH_A)$(ARCH_C)
+
+# Newer binutils versions default to ISA spec version 20191213 which moves some
+# instructions from the I extension to the Zicsr and Zifencei extensions.
+toolchain-need-zicsr-zifencei := $(call cc-option-yn, -mabi=$(ABI) -march=$(RISCV_MARCH)_zicsr_zifencei)
+ifeq ($(toolchain-need-zicsr-zifencei),y)
+	RISCV_MARCH := $(RISCV_MARCH)_zicsr_zifencei
+endif
+
+ARCH_FLAGS = -march=$(RISCV_MARCH) -mabi=$(ABI) \
 	     -mcmodel=$(CMODEL)

 PLATFORM_CPPFLAGS	+= $(ARCH_FLAGS)
--- a/arch/riscv/cpu/c9xx/cpu.c
+++ b/arch/riscv/cpu/c9xx/cpu.c
@@ -125,10 +125,11 @@ void icache_enable(void)
 #ifdef CONFIG_SPL_BUILD
 #ifdef CONFIG_SPL_RISCV_MMODE
 #ifdef CONFIG_TARGET_LIGHT_C910
+// mhcr is 0x7c1
 	asm volatile (
-        "csrr x29, mhcr\n\t"
+        "csrr x29, 0x7c1\n\t"
        "ori x28, x29, 0x1\n\t"
-        "csrw mhcr, x28\n\t"
+        "csrw 0x7c1, x28\n\t"
    );
 #endif
 #endif
@@ -141,9 +142,9 @@ void dcache_enable(void)
 #ifdef CONFIG_SPL_RISCV_MMODE
 #ifdef CONFIG_TARGET_LIGHT_C910
 	asm volatile (
-		"csrr x29, mhcr\n\t"
-        "ori x28, x29, 0x2\n\t"
-        "csrw mhcr, x28\n\t"
+	"csrr x29, 0x7c1\n\t"
+	"ori x28, x29, 0x2\n\t"
+	"csrw 0x7c1, x28\n\t"
    );
 #endif
 #endif
--- a/arch/riscv/dts/Makefile
+++ b/arch/riscv/dts/Makefile
@@ -5,7 +5,9 @@ dtb-$(CONFIG_TARGET_SIFIVE_FU540) += hifive-unleashed-a00.dtb
 dtb-$(CONFIG_TARGET_ICE_C910) += ice-c910.dtb
 dtb-$(CONFIG_TARGET_LIGHT_EVB_MPW_C910) += light-evb-mpw-c910.dtb
 dtb-$(CONFIG_TARGET_LIGHT_FPGA_FM_C910) += light-fpga-fm-c910.dtb
-dtb-$(CONFIG_TARGET_LIGHT_C910) += light-a-ref.dtb light-b-ref.dtb light-a-val.dtb light-b-product.dtb light-a-product.dtb light-ant-ref.dtb light-beagle.dtb light-b-power.dtb light-lpi4a.dtb th1520-rvbook.dtb
+dtb-$(CONFIG_TARGET_LIGHT_C910) += light-a-ref.dtb light-b-ref.dtb light-a-val.dtb light-b-product.dtb light-a-product.dtb light-ant-ref.dtb light-beagle.dtb light-b-power.dtb light-lpi4a.dtb light-milkv-meles.dtb
+dtb-$(CONFIG_TARGET_LIGHT_C910) += light-lpi4a-laptop.dtb
+dtb-$(CONFIG_TARGET_LIGHT_C910) += light-huiwei.dtb

 targets += $(dtb-y)

--- a/arch/riscv/dts/light-a-val.dts
+++ b/arch/riscv/dts/light-a-val.dts
@@ -312,7 +312,7 @@
 			tpm@0{
 				compatible = "z32h330tc,z32h330tc-spi";
 				reg = <0>;
-				spi-max-frequency = <20000000>;
+				spi-max-frequency = <40000000>;
 			};
 		};

--- a/arch/riscv/dts/th1520-rvbook.dts
+++ b/arch/riscv/dts/th1520-rvbook.dts
@@ -1,6 +1,7 @@
 /dts-v1/;
-#include <dt-bindings/usb/pd.h>
+
 #include <dt-bindings/pmic/light_pmic.h>
+#include <dt-bindings/usb/pd.h>

 / {
 	model = "T-HEAD c910 light";
@@ -155,7 +156,7 @@
 				int-n-gpios = <&gpio3_porta 10 1>;
 				reg = <0x4e>;
 				status = "okay";
-		
+
 				usb_con0: connector {
 					compatible = "usb-c-connector";
 					label = "USB-C";
@@ -170,7 +171,7 @@
 					op-sink-microwatt = <10000000>;
 				};
 			};
-		
+
 			cw2015@62 {
 				clock-frequency = <100000>;
 				status = "okay";
@@ -187,6 +188,8 @@
 					0x2F 0x00 0x64 0xA5 0xB5 0x0D 0xB8 0x91>;
 				cellwise,monitor-interval-ms = <5000>;
 				cellwise,dual-cell = <1>;
+				// monitored-battery = <&battery>;
+				// power-supplies = <&bq25703>;
 			};

 			bq25703: bq25703@6b {
@@ -194,7 +197,7 @@
 				compatible = "ti,bq25703";
 				reg = <0x6b>;
 				typec0-enable-gpios = <&gpio3_porta 13 0>;  //CHG_PATH_SEL0_180
-				typec1-enable-gpios = <&gpio3_porta 12 0>;  //CHG_PATH_SEL1_180		
+				typec1-enable-gpios = <&gpio3_porta 12 0>;  //CHG_PATH_SEL1_180	
 				ti,charge-current = <2500000>;
 				ti,max-input-voltage = <5000000>;
 				ti,input-current = <2000000>;
@@ -256,6 +259,13 @@

 			#address-cells = <1>;
 			#size-cells = <0>;
+
+			pcal6408ahk_d: gpio@20 {
+				compatible = "nxp,pca9557";
+				reg = <0x18>;
+				gpio-controller;
+				#gpio-cells = <2>;
+			};
 		};

 		i2c4: i2c@ffe7f28000{
@@ -266,13 +276,6 @@

 			#address-cells = <1>;
 			#size-cells = <0>;
-
-			pcal6408ahk_a: gpio@20 {
-				compatible = "nxp,pca9554";
-				reg = <0x20>;
-				gpio-controller;
-				#gpio-cells = <2>;
-			};
 		};

 		i2c5: i2c@fff7f2c000{
@@ -522,6 +525,20 @@
 			reg = <0xff 0xef600000 0x0 0x100>;
 		};

+		usb: usb@ffe7040000 {
+			compatible = "snps,dwc3";
+			reg = <0xff 0xe7040000 0x0 0x10000>;
+			interrupts = <68>;
+			reg-shift = <2>;
+			reg-io-width = <4>;
+			maximum-speed = "super-speed";
+			dr_mode = "host";
+			dma-mask = <0xf 0xffffffff>;
+			snps,usb3_lpm_capable;
+			snps,usb_sofitpsync;
+			status = "okay";
+		};
+
 		axiscr {
 			compatible = "thead,axiscr";
 			reg = <0xff 0xff004000 0x0 0x1000>;
@@ -612,332 +629,368 @@
 			default-brightness-level = <7>;
 		};

-		ili9881c_panel {
-			status = "disabled";
-			compatible      = "ilitek,ili9881c";
-			backlight       = <&lcd_backlight>;
-			reset-gpios     = <&gpio1_porta 5 1>;   /* active low  */
-			lcd-en-gpios    = <&pcal6408ahk_a 2 0>; /* active high */
-			lcd-bias-en-gpios = <&pcal6408ahk_a 4 0>;/* active high */
+		aon {
+		compatible = "thead,light-aon";
+		status = "okay";
+
+		wakeup-by-gpio-on;
+		wakeup-by-rtc-on;
+
+		pd: light-aon-pd {
+			compatible = "thead,light-aon-pd";
+			#power-domain-cells = <1>;
 		};

-		aon {
-			compatible = "thead,light-aon";
+		light-regu-reg {
+			compatible = "thead,light-dialog-pmic";
 			status = "okay";

-			wakeup-by-gpio-on;
-			wakeup-by-rtc-on;

-			pd: light-aon-pd {
-				compatible = "thead,light-aon-pd";
-				#power-domain-cells = <1>;
+
+			soc_dvdd18_aon_reg: soc_dvdd18_aon {
+				regulator-name = "soc_dvdd18_aon";
+				regulator-boot-on;
+				regulator-always-on;
 			};

-			light-regu-reg {
-				compatible = "thead,light-dialog-pmic";
+			soc_avdd33_usb3_reg: soc_avdd33_usb3 {
+				regulator-name = "soc_avdd33_usb3";
+				regulator-boot-on;
+				regulator-always-on;
+			};
+
+			soc_dvdd08_aon_reg: soc_dvdd08_aon {
+				regulator-name = "soc_dvdd08_aon";
+				regulator-boot-on;
+				regulator-always-on;
+			};
+
+			soc_apcpu_dvdd_dvddm_reg: soc_apcpu_dvdd_dvddm {
+				regulator-name = "soc_apcpu_dvdd_dvddm";
+				regulator-min-microvolt = <300000>;
+				regulator-max-microvolt = <1570000>;
+				regulator-boot-on;
+				regulator-always-on;
+			};
+
+			soc_dvdd08_ddr_reg: soc_dvdd08_ddr {
+				regulator-name = "soc_dvdd08_ddr";
+				regulator-boot-on;
+				regulator-always-on;
+			};
+
+			soc_vdd_ddr_1v8_reg: soc_vdd_ddr_1v8 {
+				regulator-name = "soc_vdd_ddr_1v8";
+				regulator-boot-on;
+				regulator-always-on;
+			};
+
+			soc_vdd_ddr_1v1_reg: soc_vdd_ddr_1v1 {
+				regulator-name = "soc_vdd_ddr_1v1";
+				regulator-boot-on;
+				regulator-always-on;
+			};
+
+			soc_vdd_ddr_0v6_reg: soc_vdd_ddr_0v6 {
+				regulator-name = "soc_vdd_ddr_0v6";
+				regulator-boot-on;
+				regulator-always-on;
+			};
+
+			soc_dvdd18_ap_reg: soc_dvdd18_ap {
+				regulator-name = "soc_dvdd18_ap";
+				regulator-boot-on;
+				regulator-always-on;
+			};
+
+			soc_dvdd08_ap_reg: soc_dvdd08_ap {
+				regulator-name = "soc_dvdd08_ap";
+				regulator-boot-on;
+				regulator-always-on;
+			};
+
+			soc_avdd08_mipi_hdmi_reg: soc_avdd08_mipi_hdmi {
+				regulator-name = "soc_avdd08_mipi_hdmi";
+				regulator-boot-on;
+				regulator-always-on;
+			};
+
+			soc_avdd18_mipi_hdmi_reg: soc_avdd18_mipi_hdmi {
+				regulator-name = "soc_avdd18_mipi_hdmi";
+				regulator-boot-on;
+				regulator-always-on;
+			};
+
+			soc_dvdd33_emmc_reg: soc_dvdd33_emmc {
+				regulator-name = "soc_dvdd33_emmc";
+				regulator-boot-on;
+				regulator-always-on;
+			};
+
+			soc_dvdd18_emmc_reg: soc_dvdd18_emmc {
+				regulator-name = "soc_vdd18_emmc";
+				regulator-boot-on;
+				regulator-always-on;
+			};
+			soc_dovdd18_scan_reg: soc_dovdd18_scan {
+				regulator-name = "soc_dovdd18_scan";
+				regulator-min-microvolt = <900000>;
+				regulator-max-microvolt = <3600000>;
+			};
+			soc_vext_2v8_reg: soc_vext_2v8 {
+				regulator-name = "soc_vext_2v8";
+				regulator-boot-on;
+				regulator-always-on;
+				status = "disabled";
+			};
+			soc_dvdd12_scan_reg: soc_dvdd12_scan {
+				regulator-name = "soc_dvdd12_scan";
+				regulator-min-microvolt = <900000>;
+				regulator-max-microvolt = <3600000>;
+			};
+			soc_avdd28_scan_en_reg: soc_avdd28_scan_en {
+				regulator-name = "soc_avdd28_scan_en";
+				regulator-min-microvolt = <2800000>;
+				regulator-max-microvolt = <2800000>;
+			};
+			soc_avdd28_rgb_reg: soc_avdd28_rgb {
+				regulator-name = "soc_avdd28_rgb";
+				regulator-min-microvolt = <2200000>;
+				regulator-max-microvolt = <3475000>;
+				regulator-boot-on;
+				regulator-always-on;
+				status = "disabled";
+			};
+			soc_dovdd18_rgb_reg: soc_dovdd18_rgb {
+				regulator-name = "soc_dovdd18_rgb";
+				regulator-min-microvolt = <1200000>;
+				regulator-max-microvolt = <3600000>;
+				regulator-boot-on;
+				regulator-always-on;
+				status = "disabled";
+			};
+			soc_dvdd12_rgb_reg: soc_dvdd12_rgb {
+				regulator-name = "soc_dvdd12_rgb";
+				regulator-min-microvolt = <400000>;
+				regulator-max-microvolt = <1675000>;
+				regulator-boot-on;
+				regulator-always-on;
+				status = "disabled";
+			};
+			soc_avdd25_ir_reg: soc_avdd25_ir {
+				regulator-name = "soc_avdd25_ir";
+				regulator-min-microvolt = <2200000>;
+				regulator-max-microvolt = <3475000>;
+				regulator-boot-on;
+				regulator-always-on;
+				status = "disabled";
+			};
+			soc_dovdd18_ir_reg: soc_dovdd18_ir {
+				regulator-name = "soc_dovdd18_ir";
+				regulator-min-microvolt = <1200000>;
+				regulator-max-microvolt = <3600000>;
+				regulator-boot-on;
+				regulator-always-on;
+				status = "disabled";
+			};
+			soc_dvdd12_ir_reg: soc_dvdd12_ir {
+				regulator-name = "soc_dvdd12_ir";
+				regulator-min-microvolt = <400000>;
+				regulator-max-microvolt = <1675000>;
+				regulator-boot-on;
+				regulator-always-on;
+				status = "disabled";
+			};
+	   };
+
+	    aon_pmic_config {
+			compatible = "thead,light-pmic-conf";
+			status = "okay";
+
+			#address-cells = <1>;
+			#size-cells = <0>;
+			iic-config = <0 0 2>;
+			pmic_dev_0: pmic-dev@0 {
+			  pmic-name = "dialog,da9063,v1";
+			  pmic-addr = <0x5a 0x5b>;
+			  pmic_wdt_on;
+			  status = "okay";
+			};
+
+			pmic_dev_1: pmic-dev@1 {
+			  pmic-name = "dialog,da9121,v1";
+			  pmic-addr = <0x68>;
+			  status = "okay";
+			};
+
+			regu_config_0 {
+                reg_info = <&soc_dvdd18_aon_reg>;
 				status = "okay";
-
-				soc_dvdd18_aon_reg: soc_dvdd18_aon {
-					regulator-name = "soc_dvdd18_aon";
-					regulator-boot-on;
-					regulator-always-on;
-				};
-
-				soc_avdd33_usb3_reg: soc_avdd33_usb3 {
-					regulator-name = "soc_avdd33_usb3";
-					regulator-boot-on;
-					regulator-always-on;
-				};
-
-				soc_dvdd08_aon_reg: soc_dvdd08_aon {
-					regulator-name = "soc_dvdd08_aon";
-					regulator-boot-on;
-					regulator-always-on;
-				};
-
-				soc_apcpu_dvdd_dvddm_reg: soc_apcpu_dvdd_dvddm {
-					regulator-name = "soc_apcpu_dvdd_dvddm";
-					regulator-min-microvolt = <300000>;
-					regulator-max-microvolt = <1570000>;
-					regulator-boot-on;
-					regulator-always-on;
-				};
-
-				soc_dvdd08_ddr_reg: soc_dvdd08_ddr {
-					regulator-name = "soc_dvdd08_ddr";
-					regulator-boot-on;
-					regulator-always-on;
-				};
-
-				soc_vdd_ddr_1v8_reg: soc_vdd_ddr_1v8 {
-					regulator-name = "soc_vdd_ddr_1v8";
-					regulator-boot-on;
-					regulator-always-on;
-				};
-
-				soc_vdd_ddr_1v1_reg: soc_vdd_ddr_1v1 {
-					regulator-name = "soc_vdd_ddr_1v1";
-					regulator-boot-on;
-					regulator-always-on;
-				};
-
-				soc_vdd_ddr_0v6_reg: soc_vdd_ddr_0v6 {
-					regulator-name = "soc_vdd_ddr_0v6";
-					regulator-boot-on;
-					regulator-always-on;
-				};
-
-				soc_dvdd18_ap_reg: soc_dvdd18_ap {
-					regulator-name = "soc_dvdd18_ap";
-					regulator-boot-on;
-					regulator-always-on;
-				};
-
-				soc_dvdd08_ap_reg: soc_dvdd08_ap {
-					regulator-name = "soc_dvdd08_ap";
-					regulator-boot-on;
-					regulator-always-on;
-				};
-
-				soc_avdd08_mipi_hdmi_reg: soc_avdd08_mipi_hdmi {
-					regulator-name = "soc_avdd08_mipi_hdmi";
-					regulator-boot-on;
-					regulator-always-on;
-				};
-
-				soc_avdd18_mipi_hdmi_reg: soc_avdd18_mipi_hdmi {
-					regulator-name = "soc_avdd18_mipi_hdmi";
-					regulator-boot-on;
-					regulator-always-on;
-				};
-
-				soc_dvdd33_emmc_reg: soc_dvdd33_emmc {
-					regulator-name = "soc_dvdd33_emmc";
-					regulator-boot-on;
-					regulator-always-on;
-				};
-
-				soc_dvdd18_emmc_reg: soc_dvdd18_emmc {
-					regulator-name = "soc_vdd18_emmc";
-					regulator-boot-on;
-					regulator-always-on;
-				};
-				soc_dovdd18_scan_reg: soc_dovdd18_scan {
-					regulator-name = "soc_dovdd18_scan";
-					regulator-min-microvolt = <900000>;
-					regulator-max-microvolt = <3600000>;
-				};
-				soc_vext_2v8_reg: soc_vext_2v8 {
-					regulator-name = "soc_vext_2v8";
-					regulator-boot-on;
-					regulator-always-on;
-				};
-				soc_dvdd12_scan_reg: soc_dvdd12_scan {
-					regulator-name = "soc_dvdd12_scan";
-					regulator-min-microvolt = <900000>;
-					regulator-max-microvolt = <3600000>;
-				};
-				soc_avdd28_scan_en_reg: soc_avdd28_scan_en {
-					regulator-name = "soc_avdd28_scan_en";
-					regulator-min-microvolt = <2800000>;
-					regulator-max-microvolt = <2800000>;
+				regu_id@0 {
+                    pmic_dev = <&pmic_dev_0 DA9063_ID_LDO3>;
 				};
 			};

-			aon_pmic_config {
-				compatible = "thead,light-pmic-conf";
+			regu_config_1 {
+                reg_info = <&soc_avdd33_usb3_reg>;
 				status = "okay";
-
-				#address-cells = <1>;
-				#size-cells = <0>;
-				iic-config = <0 0 2>;
-				pmic_dev_0: pmic-dev@0 {
-					pmic-name = "dialog,da9063,v1";
-					pmic-addr = <0x5a 0x5b>;
-					pmic_wdt_on;
-					status = "okay";
-				};
-
-				pmic_dev_1: pmic-dev@1 {
-					pmic-name = "dialog,da9121,v1";
-					pmic-addr = <0x68>;
-					status = "okay";
-				};
-
-				regu_config_0 {
-					reg_info = <&soc_dvdd18_aon_reg>;
-					status = "okay";
-					regu_id@0 {
-						pmic_dev = <&pmic_dev_0 DA9063_ID_LDO3>;
-					};
-				};
-
-				regu_config_1 {
-					reg_info = <&soc_avdd33_usb3_reg>;
-					status = "okay";
-					regu_id@0 {
-						pmic_dev = <&pmic_dev_0 DA9063_ID_LDO9>;
-					};
-				};
-
-				regu_config_2 {
-					reg_info = <&soc_dvdd08_aon_reg>;
-					status = "okay";
-					regu_id@0 {
-						pmic_dev = <&pmic_dev_0 DA9063_ID_LDO2>;
-					};
-				};
-
-				regu_config_3 {
-					reg_info = <&soc_apcpu_dvdd_dvddm_reg>;
-					status = "okay";
-					regu_id@0 {
-						pmic_dev = <&pmic_dev_0 DA9063_ID_BCORE1>;
-						auto_on_info = <0 0 800000>;
-					};
-
-					regu_id@1 {
-						pmic_dev = <&pmic_dev_0 DA9063_ID_BCORE2>;
-						auto_on_info = <1 0 800000>;
-					};
-
-					regu_id@2 {
-						pmic_dev = <&pmic_dev_0 DA9063_ID_BUCKIO>;
-						auto_on_info = <2 0 800000>;
-					};
-
-					coupling_info@0 {
-						negative-min;
-						info = <0 2 5 30>;
-					};
-
-					coupling_info@1 {
-						negative-min;
-						info = <1 2 5 30>;
-					};
-				};
-
-				regu_config_4 {
-					reg_info = <&soc_dvdd08_ddr_reg>;
-					status = "okay";
-					regu_id@0 {
-						pmic_dev = <&pmic_dev_0 DA9063_ID_BUCKPERI>;
-					};
-				};
-
-				regu_config_5 {
-					reg_info = <&soc_vdd_ddr_1v8_reg>;
-					status = "okay";
-					regu_id@0 {
-						pmic_dev = <&pmic_dev_0 DA9063_ID_LDO4>;
-					};
-				};
-
-				regu_config_6 {
-					reg_info = <&soc_vdd_ddr_1v1_reg>;
-					status = "okay";
-					regu_id@0 {
-						pmic_dev = <&pmic_dev_0 DA9063_ID_BUCKMEM>;
-					};
-				};
-
-				regu_config_7 {
-					reg_info = <&soc_vdd_ddr_0v6_reg>;
-					status = "okay";
-					regu_id@0 {
-						pmic_dev = <&pmic_dev_0 DA9063_ID_BUCKPRO>;
-					};
-				};
-
-				regu_config_8 {
-					reg_info = <&soc_dvdd18_ap_reg>;
-					status = "okay";
-					regu_id@0 {
-						pmic_dev = <&pmic_dev_0 DA9063_ID_LDO11>;
-					};
-				};
-
-				regu_config_9 {
-					reg_info = <&soc_dvdd08_ap_reg>;
-					status = "okay";
-					regu_id@0 {
-						pmic_dev = <&pmic_dev_1 DA9121_ID_BUCK1>;
-						parent_pmic_dev = <&pmic_dev_0 2 0>;
-					};
-				};
-
-				regu_config_10 {
-					reg_info = <&soc_avdd08_mipi_hdmi_reg>;
-					status = "okay";
-					regu_id@0 {
-						pmic_dev = <&pmic_dev_0 DA9063_ID_LDO1>;
-					};
-				};
-
-				regu_config_11 {
-					reg_info = <&soc_avdd18_mipi_hdmi_reg>;
-					status = "okay";
-					regu_id@0 {
-						pmic_dev = <&pmic_dev_0 DA9063_ID_LDO5>;
-					};
-				};
-
-				regu_config_12 {
-					reg_info = <&soc_dvdd33_emmc_reg>;
-					status = "okay";
-					regu_id@0 {
-						pmic_dev = <&pmic_dev_0 DA9063_ID_LDO10>;
-					};
-				};
-
-				regu_config_13 {
-					reg_info = <&soc_dvdd18_emmc_reg>;
-					status = "okay";
-					regu_id@0 {
-						pmic_dev = <&pmic_dev_0 DA9063_ID_GPIO7>;
-						parent_pmic_dev = <&pmic_dev_0 7 0>;
-					};
-				};
-
-				regu_config_14 {
-					reg_info = <&soc_dovdd18_scan_reg>;
-					status = "okay";
-					regu_id@0 {
-						pmic_dev = <&pmic_dev_0 DA9063_ID_LDO6>;
-						auto_on_info = <2 1 1800000>;
-						auto_off_info = <7 1>;
-					};
-				};
-
-				regu_config_15 {
-					reg_info = <&soc_vext_2v8_reg>;
-					status = "okay";
-					regu_id@0 {
-						pmic_dev = <&pmic_dev_0 DA9063_ID_LDO7>;
-						auto_on_info = <3 1 2800000>;
-						auto_off_info = <8 1>;
-					};
-				};
-
-				regu_config_16 {
-					reg_info = <&soc_dvdd12_scan_reg>;
-					status = "okay";
-					regu_id@0 {
-						pmic_dev = <&pmic_dev_0 DA9063_ID_LDO8>;
-						auto_on_info = <4 1 1200000>;
-						auto_off_info = <9 1>;
-					};
-				};
-
-				regu_config_17 {
-					reg_info = <&soc_avdd28_scan_en_reg>;
-					status = "okay";
-					regu_id@0 {
-						pmic_dev = <&pmic_dev_0 DA9063_ID_GPIO4>;
-					};
+				regu_id@0 {
+                    pmic_dev = <&pmic_dev_0 DA9063_ID_LDO9>;
 				};
 			};
-	   	};
+
+			regu_config_2 {
+                reg_info = <&soc_dvdd08_aon_reg>;
+				status = "okay";
+				regu_id@0 {
+                    pmic_dev = <&pmic_dev_0 DA9063_ID_LDO2>;
+				};
+			};
+
+			regu_config_3 {
+                reg_info = <&soc_apcpu_dvdd_dvddm_reg>;
+				status = "okay";
+				regu_id@0 {
+                    pmic_dev = <&pmic_dev_0 DA9063_ID_BCORE1>;
+					auto_on_info = <0 0 800000>;
+				};
+
+				regu_id@1 {
+                    pmic_dev = <&pmic_dev_0 DA9063_ID_BCORE2>;
+					auto_on_info = <1 0 800000>;
+				};
+
+				regu_id@2 {
+                    pmic_dev = <&pmic_dev_0 DA9063_ID_BUCKIO>;
+					auto_on_info = <2 0 800000>;
+				};
+
+				coupling_info@0 {
+					negative-min;
+                    info = <0 2 5 30>;
+				};
+
+				coupling_info@1 {
+					negative-min;
+                    info = <1 2 5 30>;
+				};
+			};
+
+			regu_config_4 {
+                reg_info = <&soc_dvdd08_ddr_reg>;
+				status = "okay";
+				regu_id@0 {
+                    pmic_dev = <&pmic_dev_0 DA9063_ID_BUCKPERI>;
+				};
+			};
+
+			regu_config_5 {
+                reg_info = <&soc_vdd_ddr_1v8_reg>;
+				status = "okay";
+				regu_id@0 {
+                    pmic_dev = <&pmic_dev_0 DA9063_ID_LDO4>;
+				};
+			};
+
+		    regu_config_6 {
+                reg_info = <&soc_vdd_ddr_1v1_reg>;
+				status = "okay";
+				regu_id@0 {
+                    pmic_dev = <&pmic_dev_0 DA9063_ID_BUCKMEM>;
+				};
+			};
+
+			regu_config_7 {
+                reg_info = <&soc_vdd_ddr_0v6_reg>;
+				status = "okay";
+				regu_id@0 {
+                    pmic_dev = <&pmic_dev_0 DA9063_ID_BUCKPRO>;
+				};
+			};
+
+			regu_config_8 {
+                reg_info = <&soc_dvdd18_ap_reg>;
+				status = "okay";
+				regu_id@0 {
+                    pmic_dev = <&pmic_dev_0 DA9063_ID_LDO11>;
+				};
+			};
+
+            regu_config_9 {
+                reg_info = <&soc_avdd08_mipi_hdmi_reg>;
+				status = "okay";
+				regu_id@0 {
+					pmic_dev = <&pmic_dev_0 DA9063_ID_LDO1>;
+				};
+			};
+
+			regu_config_10 {
+                reg_info = <&soc_avdd18_mipi_hdmi_reg>;
+				status = "okay";
+				regu_id@0 {
+                    pmic_dev = <&pmic_dev_0 DA9063_ID_LDO5>;
+				};
+			};
+
+			regu_config_11 {
+                reg_info = <&soc_dvdd33_emmc_reg>;
+				status = "okay";
+				regu_id@0 {
+                    pmic_dev = <&pmic_dev_0 DA9063_ID_LDO10>;
+				};
+			};
+
+			regu_config_12 {
+                reg_info = <&soc_dovdd18_scan_reg>;
+				status = "okay";
+				regu_id@0 {
+                    pmic_dev = <&pmic_dev_0 DA9063_ID_LDO6>;
+					auto_on_info = <3 1 1800000>;
+					auto_off_info = <1 1>;
+				};
+			};
+
+
+			regu_config_13 {
+                reg_info = <&soc_dvdd12_scan_reg>;
+				status = "okay";
+				regu_id@0 {
+                    pmic_dev = <&pmic_dev_0 DA9063_ID_LDO8>;
+					auto_on_info = <4 1 1200000>;
+					auto_off_info = <2 1>;
+				};
+			};
+
+			regu_config_14 {
+                reg_info = <&soc_avdd28_scan_en_reg>;
+				status = "okay";
+				regu_id@0 {
+                    pmic_dev = <&pmic_dev_0 DA9063_ID_LDO7>;
+					auto_on_info = <5 1 2800000>;
+					auto_off_info = <0 1>;
+				};
+			};
+
+			regu_config_15 {
+                reg_info = <&soc_dvdd08_ap_reg>;
+				status = "okay";
+				regu_id@0 {
+                    pmic_dev = <&pmic_dev_1 DA9121_ID_BUCK1>;
+                    parent_pmic_dev = <&pmic_dev_0 2 0>;
+				};
+			};
+
+			regu_config_16 {
+                reg_info = <&soc_dvdd18_emmc_reg>;
+				status = "okay";
+				regu_id@0 {
+                    pmic_dev = <&pmic_dev_0 DA9063_ID_GPIO7>;
+					parent_pmic_dev = <&pmic_dev_0 7 0>;
+				};
+			};
+		};
+	};
+
 	};

 	chosen {
--- a/arch/riscv/dts/light-lpi4a-laptop.dts
+++ b/arch/riscv/dts/light-lpi4a-laptop.dts
@@ -0,0 +1,46 @@
+#include "light-lpi4a.dts"
+
+/ {
+};
+
+&i2c1 {
+	clock-frequency = <400000>;
+        status = "okay";
+
+        pcal6408ahk_c: gpio@20 {
+                compatible = "nxp,pca9557";
+                reg = <0x18>;
+                gpio-controller;
+                #gpio-cells = <2>;
+        };
+};
+
+&i2c3 {
+	clock-frequency = <400000>;
+	status = "okay";
+	pcal6408ahk_d: gpio@20 {
+		compatible = "nxp,pca9557";
+		reg = <0x18>;
+		gpio-controller;
+		#gpio-cells = <2>;
+	};
+};
+
+&lcd_backlight {
+	pwms = <&pwm 0 50000>;
+	brightness-levels = <0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35
+	36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75
+	76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100>;
+	default-brightness-level = <2>;
+};
+
+&panel0 {
+	compatible = "ilitek,ili9881c";
+	status = "okay";
+	backlight = <&lcd_backlight>;
+	// 5v power cycle
+	// TODO: move into regulator
+	reset-gpios     = <&pcal6408ahk_c 0 0>; /* active low  */
+	/delete-property/ lcd-en-gpios;
+	/delete-property/ lcd-bias-en-gpios;
+};
--- a/arch/riscv/dts/light-lpi4a.dts
+++ b/arch/riscv/dts/light-lpi4a.dts
@@ -489,7 +489,7 @@
 			default-brightness-level = <7>;
 		};

-		jadard_jd9365da {
+		panel0: dsi_panel0 {
 			compatible      = "jadard,jd9365da-h3";
 			backlight       = <&lcd_backlight>;
 			reset-gpio     = <&pcal6408ahk_d 7 0>;
--- a/arch/riscv/dts/light-milkv-meles.dts
+++ b/arch/riscv/dts/light-milkv-meles.dts
@@ -0,0 +1,654 @@
+/dts-v1/;
+
+#include <dt-bindings/pmic/light_pmic.h>
+
+/ {
+	model = "Milk-V Meles";
+	compatible = "milkv,meles", "thead,c910_light";
+	#address-cells = <2>;
+	#size-cells = <2>;
+
+	config {
+		select-gpio = <&gpio1_porta 16 0>;
+	};
+
+	memory@0 {
+		device_type = "memory";
+		reg = <0x0 0xc0000000 0x0 0x40000000>;
+	};
+
+	cpus {
+		#address-cells = <1>;
+		#size-cells = <0>;
+		timebase-frequency = <3000000>;
+		u-boot,dm-pre-reloc;
+		cpu@0 {
+			device_type = "cpu";
+			reg = <0>;
+			status = "okay";
+			compatible = "riscv";
+			riscv,isa = "rv64imafdcvsu";
+			mmu-type = "riscv,sv39";
+			u-boot,dm-pre-reloc;
+		};
+	};
+
+	soc {
+		#address-cells = <2>;
+		#size-cells = <2>;
+		compatible = "simple-bus";
+		ranges;
+		u-boot,dm-pre-reloc;
+
+		intc: interrupt-controller@ffd8000000 {
+			compatible = "riscv,plic0";
+			reg = <0xff 0xd8000000 0x0 0x04000000>;
+			status = "disabled";
+		};
+
+		dummy_apb: apb-clock {
+			compatible = "fixed-clock";
+			clock-frequency = <62500000>;
+			clock-output-names = "dummy_apb";
+			#clock-cells = <0>;
+			u-boot,dm-pre-reloc;
+		};
+
+		dummy_ahb: ahb-clock {
+			compatible = "fixed-clock";
+			clock-frequency = <250000000>;
+			clock-output-names = "core";
+			#clock-cells = <0>;
+			u-boot,dm-pre-reloc;
+		};
+
+		dummy_spi: spi-clock {
+			compatible = "fixed-clock";
+			clock-frequency = <396000000>;
+			clock-output-names = "dummy_spi";
+			#clock-cells = <0>;
+			u-boot,dm-pre-reloc;
+		};
+
+		dummy_qspi0: qspi0-clock {
+			compatible = "fixed-clock";
+			clock-frequency = <792000000>;
+			clock-output-names = "dummy_qspi0";
+			#clock-cells = <0>;
+			u-boot,dm-pre-reloc;
+		};
+
+		dummy_uart_sclk: uart-sclk-clock {
+			compatible = "fixed-clock";
+			clock-frequency = <100000000>;
+			clock-output-names = "dummy_uart_sclk";
+			#clock-cells = <0>;
+			u-boot,dm-pre-reloc;
+		};
+
+		dummy_i2c_icclk: i2c-icclk-clock {
+			compatible = "fixed-clock";
+			clock-frequency = <50000000>;
+			clock-output-names = "dummy_i2c_icclk";
+			#clock-cells = <0>;
+			u-boot,dm-pre-reloc;
+		};
+
+		dummy_dpu_pixclk: dpu-pix-clock {
+			compatible = "fixed-clock";
+			clock-frequency = <74250000>;
+			clock-output-names = "dummy_dpu_pixclk";
+			#clock-cells = <0>;
+			u-boot,dm-pre-reloc;
+		};
+
+		dummy_dphy_refclk: dphy-ref-clock {
+			compatible = "fixed-clock";
+			clock-frequency = <24000000>;
+			clock-output-names = "dummy_dpu_refclk";
+			#clock-cells = <0>;
+			u-boot,dm-pre-reloc;
+		};
+
+		serial@ffe7014000 {
+			compatible = "snps,dw-apb-uart";
+			reg = <0xff 0xe7014000 0x0 0x400>;
+			clocks = <&dummy_uart_sclk>;
+			clock-frequency = <100000000>;
+			clock-names = "baudclk";
+			reg-shift = <2>;
+			reg-io-width = <4>;
+			u-boot,dm-pre-reloc;
+		};
+
+		gmac0: ethernet@ffe7070000 {
+			compatible = "snps,dwmac";
+			reg = <0xff 0xe7070000 0x0 0x2000>;
+			clocks = <&dummy_apb>;
+			clock-names = "stmmaceth";
+			snps,pbl = <32>;
+			snps,fixed-burst;
+
+			phy-mode = "rgmii-id";
+			phy-handle = <&phy_88E1111_a>;
+			status = "okay";
+			mdio0 {
+				#address-cells = <1>;
+				#size-cells = <0>;
+				compatible = "snps,dwmac-mdio";
+
+				phy_88E1111_a: ethernet-phy@1 {
+					reg = <0x1>;
+				};
+			};
+		};
+
+		emmc: sdhci@ffe7080000 {
+			compatible = "snps,dwcmshc-sdhci";
+			reg = <0xff 0xe7080000 0x0 0x10000>;
+			index = <0x0>;
+			clocks = <&dummy_ahb>;
+			clock-frequency = <198000000>;
+			clock-names = "core";
+			max-frequency = <198000000>;
+			sdhci-caps-mask = <0x0 0x1000000>;
+			mmc-hs400-1_8v;
+			non-removable;
+			no-sdio;
+			no-sd;
+			bus-width = <8>;
+			voltage= "1.8v";
+			pull_up;
+			io_fixed_1v8;
+			fifo-mode;
+			u-boot,dm-pre-reloc;
+		};
+
+		sdhci0: sd@ffe7090000 {
+			compatible = "snps,dwcmshc-sdhci";
+			reg = <0xff 0xe7090000 0x0 0x10000>;
+			index = <0x1>;
+			clocks = <&dummy_ahb>;
+			clock-frequency = <198000000>;
+			max-frequency = <198000000>;
+			sd-uhs-sdr104;
+			pull_up;
+			clock-names = "core";
+			bus-width = <4>;
+			voltage= "3.3v";
+		};
+
+		gpio2: gpio@ffe7f34000 {
+			compatible = "snps,dw-apb-gpio";
+			reg = <0xff 0xe7f34000 0x0 0x1000>;
+			clocks = <&dummy_apb>;
+			#address-cells = <1>;
+			#size-cells = <0>;
+			gpio2_porta: gpio-controller@0 {
+				compatible = "snps,dw-apb-gpio-port";
+				gpio-controller;
+				#gpio-cells = <2>;
+				snps,nr-gpios = <32>;
+				reg = <0>;
+			};
+		};
+
+		gpio0: gpio@ffec005000 {
+			compatible = "snps,dw-apb-gpio";
+			reg = <0xff 0xec005000 0x0 0x1000>;
+			clocks = <&dummy_apb>;
+			#address-cells = <1>;
+			#size-cells = <0>;
+			gpio0_porta: gpio-controller@0 {
+				compatible = "snps,dw-apb-gpio-port";
+				gpio-controller;
+				#gpio-cells = <2>;
+				snps,nr-gpios = <32>;
+				reg = <0>;
+			};
+		};
+
+		gpio1: gpio@ffec006000 {
+			compatible = "snps,dw-apb-gpio";
+			reg = <0xff 0xec006000 0x0 0x1000>;
+			clocks = <&dummy_apb>;
+			#address-cells = <1>;
+			#size-cells = <0>;
+
+			gpio1_porta: gpio-controller@0 {
+				compatible = "snps,dw-apb-gpio-port";
+				gpio-controller;
+				#gpio-cells = <2>;
+				snps,nr-gpios = <32>;
+				reg = <0>;
+			};
+		};
+
+		axiscr {
+			compatible = "thead,axiscr";
+			reg = <0xff 0xff004000 0x0 0x1000>;
+			lock-read = "okay";
+			lock-write = "okay";
+			#address-cells = <2>;
+			#size-cells = <2>;
+			u-boot,dm-pre-reloc;
+			axiscr0: axisrc@0 {
+				device_type = "axiscr";
+				region = <0x00 0x00000000 0x00 0x80000000>; // 4KB align
+				status = "disabled";
+				#address-cells = <2>;
+				#size-cells = <2>;
+				u-boot,dm-pre-reloc;
+			};
+			axiscr1: axisrc@1 {
+				device_type = "axiscr";
+				region = <0x00 0x80000000 0x00 0x80000000>; // 4KB align
+				status = "disabled";
+				#address-cells = <2>;
+				#size-cells = <2>;
+				u-boot,dm-pre-reloc;
+			};
+			axiscr2: axisrc@2 {
+				device_type = "axiscr";
+				region = <0x01 0x00000000 0x00 0x80000000>; // 4KB align
+				status = "disabled";
+				#address-cells = <2>;
+				#size-cells = <2>;
+				u-boot,dm-pre-reloc;
+			};
+		};
+
+		axiparity {
+			compatible = "thead,axiparity";
+			reg = <0xff 0xff00c000 0x0 0x1000>;
+			lock = "okay";
+			#address-cells = <2>;
+			#size-cells = <2>;
+			u-boot,dm-pre-reloc;
+			axiparity0: axiparity@0 {
+				device_type = "axiparity";
+				region = <0x00 0x00000000 0x01 0x0000000>; // 4KB align
+				status = "disabled";
+				#address-cells = <2>;
+				#size-cells = <2>;
+				u-boot,dm-pre-reloc;
+			};
+			axiparity1: axiparity@1 {
+				device_type = "axiparity";
+				region = <0x01 0x00000000 0x01 0x00000000>; // 4KB align
+				status = "disabled";
+				#address-cells = <2>;
+				#size-cells = <2>;
+				u-boot,dm-pre-reloc;
+			};
+		};
+
+		aon {
+		compatible = "thead,light-aon";
+		status = "okay";
+
+		wakeup-by-gpio-on;
+		wakeup-by-rtc-on;
+
+		pd: light-aon-pd {
+			compatible = "thead,light-aon-pd";
+			#power-domain-cells = <1>;
+		};
+
+		light-regu-reg {
+			compatible = "thead,light-dialog-pmic";
+			status = "okay";
+
+
+
+			soc_dvdd18_aon_reg: soc_dvdd18_aon {
+				regulator-name = "soc_dvdd18_aon";
+				regulator-boot-on;
+				regulator-always-on;
+			};
+
+			soc_avdd33_usb3_reg: soc_avdd33_usb3 {
+				regulator-name = "soc_avdd33_usb3";
+				regulator-boot-on;
+				regulator-always-on;
+			};
+
+			soc_dvdd08_aon_reg: soc_dvdd08_aon {
+				regulator-name = "soc_dvdd08_aon";
+				regulator-boot-on;
+				regulator-always-on;
+			};
+
+			soc_apcpu_dvdd_dvddm_reg: soc_apcpu_dvdd_dvddm {
+				regulator-name = "soc_apcpu_dvdd_dvddm";
+				regulator-min-microvolt = <300000>;
+				regulator-max-microvolt = <1570000>;
+				regulator-boot-on;
+				regulator-always-on;
+			};
+
+			soc_dvdd08_ddr_reg: soc_dvdd08_ddr {
+				regulator-name = "soc_dvdd08_ddr";
+				regulator-boot-on;
+				regulator-always-on;
+			};
+
+			soc_vdd_ddr_1v8_reg: soc_vdd_ddr_1v8 {
+				regulator-name = "soc_vdd_ddr_1v8";
+				regulator-boot-on;
+				regulator-always-on;
+			};
+
+			soc_vdd_ddr_1v1_reg: soc_vdd_ddr_1v1 {
+				regulator-name = "soc_vdd_ddr_1v1";
+				regulator-boot-on;
+				regulator-always-on;
+			};
+
+			soc_vdd_ddr_0v6_reg: soc_vdd_ddr_0v6 {
+				regulator-name = "soc_vdd_ddr_0v6";
+				regulator-boot-on;
+				regulator-always-on;
+			};
+
+			soc_dvdd18_ap_reg: soc_dvdd18_ap {
+				regulator-name = "soc_dvdd18_ap";
+				regulator-boot-on;
+				regulator-always-on;
+			};
+
+			soc_dvdd08_ap_reg: soc_dvdd08_ap {
+				regulator-name = "soc_dvdd08_ap";
+				regulator-boot-on;
+				regulator-always-on;
+			};
+
+			soc_avdd08_mipi_hdmi_reg: soc_avdd08_mipi_hdmi {
+				regulator-name = "soc_avdd08_mipi_hdmi";
+				regulator-boot-on;
+				regulator-always-on;
+			};
+
+			soc_avdd18_mipi_hdmi_reg: soc_avdd18_mipi_hdmi {
+				regulator-name = "soc_avdd18_mipi_hdmi";
+				regulator-boot-on;
+				regulator-always-on;
+			};
+
+			soc_dvdd33_emmc_reg: soc_dvdd33_emmc {
+				regulator-name = "soc_dvdd33_emmc";
+				regulator-boot-on;
+				regulator-always-on;
+			};
+
+			soc_dvdd18_emmc_reg: soc_dvdd18_emmc {
+				regulator-name = "soc_vdd18_emmc";
+				regulator-boot-on;
+				regulator-always-on;
+			};
+			soc_dovdd18_scan_reg: soc_dovdd18_scan {
+				regulator-name = "soc_dovdd18_scan";
+				regulator-min-microvolt = <900000>;
+				regulator-max-microvolt = <3600000>;
+			};
+			soc_vext_2v8_reg: soc_vext_2v8 {
+				regulator-name = "soc_vext_2v8";
+				regulator-boot-on;
+				regulator-always-on;
+				status = "disabled";
+			};
+			soc_dvdd12_scan_reg: soc_dvdd12_scan {
+				regulator-name = "soc_dvdd12_scan";
+				regulator-min-microvolt = <900000>;
+				regulator-max-microvolt = <3600000>;
+			};
+			soc_avdd28_scan_en_reg: soc_avdd28_scan_en {
+				regulator-name = "soc_avdd28_scan_en";
+				regulator-min-microvolt = <2800000>;
+				regulator-max-microvolt = <2800000>;
+			};
+			soc_avdd28_rgb_reg: soc_avdd28_rgb {
+				regulator-name = "soc_avdd28_rgb";
+				regulator-min-microvolt = <2200000>;
+				regulator-max-microvolt = <3475000>;
+				regulator-boot-on;
+				regulator-always-on;
+				status = "disabled";
+			};
+			soc_dovdd18_rgb_reg: soc_dovdd18_rgb {
+				regulator-name = "soc_dovdd18_rgb";
+				regulator-min-microvolt = <1200000>;
+				regulator-max-microvolt = <3600000>;
+				regulator-boot-on;
+				regulator-always-on;
+				status = "disabled";
+			};
+			soc_dvdd12_rgb_reg: soc_dvdd12_rgb {
+				regulator-name = "soc_dvdd12_rgb";
+				regulator-min-microvolt = <400000>;
+				regulator-max-microvolt = <1675000>;
+				regulator-boot-on;
+				regulator-always-on;
+				status = "disabled";
+			};
+			soc_avdd25_ir_reg: soc_avdd25_ir {
+				regulator-name = "soc_avdd25_ir";
+				regulator-min-microvolt = <2200000>;
+				regulator-max-microvolt = <3475000>;
+				regulator-boot-on;
+				regulator-always-on;
+				status = "disabled";
+			};
+			soc_dovdd18_ir_reg: soc_dovdd18_ir {
+				regulator-name = "soc_dovdd18_ir";
+				regulator-min-microvolt = <1200000>;
+				regulator-max-microvolt = <3600000>;
+				regulator-boot-on;
+				regulator-always-on;
+				status = "disabled";
+			};
+			soc_dvdd12_ir_reg: soc_dvdd12_ir {
+				regulator-name = "soc_dvdd12_ir";
+				regulator-min-microvolt = <400000>;
+				regulator-max-microvolt = <1675000>;
+				regulator-boot-on;
+				regulator-always-on;
+				status = "disabled";
+			};
+	   };
+
+	    aon_pmic_config {
+			compatible = "thead,light-pmic-conf";
+			status = "okay";
+
+			#address-cells = <1>;
+			#size-cells = <0>;
+			iic-config = <0 0 2>;
+			pmic_dev_0: pmic-dev@0 {
+			  pmic-name = "dialog,da9063,v1";
+			  pmic-addr = <0x5a 0x5b>;
+			  pmic_wdt_on;
+			  status = "okay";
+			};
+
+			pmic_dev_1: pmic-dev@1 {
+			  pmic-name = "dialog,da9121,v1";
+			  pmic-addr = <0x68>;
+			  status = "okay";
+			};
+
+			regu_config_0 {
+                reg_info = <&soc_dvdd18_aon_reg>;
+				status = "okay";
+				regu_id@0 {
+                    pmic_dev = <&pmic_dev_0 DA9063_ID_LDO3>;
+				};
+			};
+
+			regu_config_1 {
+                reg_info = <&soc_avdd33_usb3_reg>;
+				status = "okay";
+				regu_id@0 {
+                    pmic_dev = <&pmic_dev_0 DA9063_ID_LDO9>;
+				};
+			};
+
+			regu_config_2 {
+                reg_info = <&soc_dvdd08_aon_reg>;
+				status = "okay";
+				regu_id@0 {
+                    pmic_dev = <&pmic_dev_0 DA9063_ID_LDO2>;
+				};
+			};
+
+			regu_config_3 {
+                reg_info = <&soc_apcpu_dvdd_dvddm_reg>;
+				status = "okay";
+				regu_id@0 {
+                    pmic_dev = <&pmic_dev_0 DA9063_ID_BCORE1>;
+					auto_on_info = <0 0 800000>;
+				};
+
+				regu_id@1 {
+                    pmic_dev = <&pmic_dev_0 DA9063_ID_BCORE2>;
+					auto_on_info = <1 0 800000>;
+				};
+
+				regu_id@2 {
+                    pmic_dev = <&pmic_dev_0 DA9063_ID_BUCKIO>;
+					auto_on_info = <2 0 800000>;
+				};
+
+				coupling_info@0 {
+					negative-min;
+                    info = <0 2 5 30>;
+				};
+
+				coupling_info@1 {
+					negative-min;
+                    info = <1 2 5 30>;
+				};
+			};
+
+			regu_config_4 {
+                reg_info = <&soc_dvdd08_ddr_reg>;
+				status = "okay";
+				regu_id@0 {
+                    pmic_dev = <&pmic_dev_0 DA9063_ID_BUCKPERI>;
+				};
+			};
+
+			regu_config_5 {
+                reg_info = <&soc_vdd_ddr_1v8_reg>;
+				status = "okay";
+				regu_id@0 {
+                    pmic_dev = <&pmic_dev_0 DA9063_ID_LDO4>;
+				};
+			};
+
+		    regu_config_6 {
+                reg_info = <&soc_vdd_ddr_1v1_reg>;
+				status = "okay";
+				regu_id@0 {
+                    pmic_dev = <&pmic_dev_0 DA9063_ID_BUCKMEM>;
+				};
+			};
+
+			regu_config_7 {
+                reg_info = <&soc_vdd_ddr_0v6_reg>;
+				status = "okay";
+				regu_id@0 {
+                    pmic_dev = <&pmic_dev_0 DA9063_ID_BUCKPRO>;
+				};
+			};
+
+			regu_config_8 {
+                reg_info = <&soc_dvdd18_ap_reg>;
+				status = "okay";
+				regu_id@0 {
+                    pmic_dev = <&pmic_dev_0 DA9063_ID_LDO11>;
+				};
+			};
+
+            regu_config_9 {
+                reg_info = <&soc_avdd08_mipi_hdmi_reg>;
+				status = "okay";
+				regu_id@0 {
+					pmic_dev = <&pmic_dev_0 DA9063_ID_LDO1>;
+				};
+			};
+
+			regu_config_10 {
+                reg_info = <&soc_avdd18_mipi_hdmi_reg>;
+				status = "okay";
+				regu_id@0 {
+                    pmic_dev = <&pmic_dev_0 DA9063_ID_LDO5>;
+				};
+			};
+
+			regu_config_11 {
+                reg_info = <&soc_dvdd33_emmc_reg>;
+				status = "okay";
+				regu_id@0 {
+                    pmic_dev = <&pmic_dev_0 DA9063_ID_LDO10>;
+				};
+			};
+
+			regu_config_12 {
+                reg_info = <&soc_dovdd18_scan_reg>;
+				status = "okay";
+				regu_id@0 {
+                    pmic_dev = <&pmic_dev_0 DA9063_ID_LDO6>;
+					auto_on_info = <3 1 1800000>;
+					auto_off_info = <1 1>;
+				};
+			};
+
+
+			regu_config_13 {
+                reg_info = <&soc_dvdd12_scan_reg>;
+				status = "okay";
+				regu_id@0 {
+                    pmic_dev = <&pmic_dev_0 DA9063_ID_LDO8>;
+					auto_on_info = <4 1 1200000>;
+					auto_off_info = <2 1>;
+				};
+			};
+
+			regu_config_14 {
+                reg_info = <&soc_avdd28_scan_en_reg>;
+				status = "okay";
+				regu_id@0 {
+                    pmic_dev = <&pmic_dev_0 DA9063_ID_LDO7>;
+					auto_on_info = <5 1 2800000>;
+					auto_off_info = <0 1>;
+				};
+			};
+
+			regu_config_15 {
+                reg_info = <&soc_dvdd08_ap_reg>;
+				status = "okay";
+				regu_id@0 {
+                    pmic_dev = <&pmic_dev_1 DA9121_ID_BUCK1>;
+                    parent_pmic_dev = <&pmic_dev_0 2 0>;
+				};
+			};
+
+			regu_config_16 {
+                reg_info = <&soc_dvdd18_emmc_reg>;
+				status = "okay";
+				regu_id@0 {
+                    pmic_dev = <&pmic_dev_0 DA9063_ID_GPIO7>;
+					parent_pmic_dev = <&pmic_dev_0 7 0>;
+				};
+			};
+		};
+	};
+	
+	};
+
+	chosen {
+		bootargs = "console=ttyS0,115200";
+		stdout-path = "/soc/serial@ffe7014000:115200";
+	};
+};
--- a/arch/riscv/include/asm/bitops.h
+++ b/arch/riscv/include/asm/bitops.h
@@ -90,6 +90,16 @@ static inline int __test_and_clear_bit(int nr, void *addr)
 	return retval;
 }

+static inline int test_and_clear_bit(int nr, volatile void * addr)
+{
+	unsigned long flags = 0;
+	int out;
+
+	out = __test_and_clear_bit(nr, addr);
+
+	return out;
+}
+
 static inline int __test_and_change_bit(int nr, void *addr)
 {
 	int mask, retval;
--- a/arch/sandbox/dts/Makefile
+++ b/arch/sandbox/dts/Makefile
@@ -6,6 +6,7 @@ else
 dtb-$(CONFIG_SANDBOX) += sandbox.dtb
 endif
 dtb-$(CONFIG_UT_DM) += test.dtb
+dtb-$(CONFIG_CMD_EXTENSION) += overlay0.dtbo overlay1.dtbo

 targets += $(dtb-y)

--- a/arch/sandbox/dts/overlay0.dts
+++ b/arch/sandbox/dts/overlay0.dts
@@ -0,0 +1,9 @@
+/dts-v1/;
+/plugin/;
+
+&{/buttons} {
+	btn3 {
+		gpios = <&gpio_a 5 0>;
+		label = "button3";
+	};
+};
--- a/arch/sandbox/dts/overlay1.dts
+++ b/arch/sandbox/dts/overlay1.dts
@@ -0,0 +1,9 @@
+/dts-v1/;
+/plugin/;
+
+&{/buttons} {
+	btn4 {
+		gpios = <&gpio_a 5 0>;
+		label = "button4";
+	};
+};
--- a/board/sandbox/sandbox.c
+++ b/board/sandbox/sandbox.c
@@ -12,6 +12,9 @@
 #include <os.h>
 #include <asm/test.h>
 #include <asm/u-boot-sandbox.h>
+#include <malloc.h>
+
+#include <extension_board.h>

 /*
 * Pointer to initial global data area
@@ -58,6 +61,26 @@ int board_init(void)
 	return 0;
 }

+#ifdef CONFIG_CMD_EXTENSION
+int extension_board_scan(struct list_head *extension_list)
+{
+	struct extension *extension;
+	int i;
+
+	for (i = 0; i < 2; i++) {
+		extension = calloc(1, sizeof(struct extension));
+		snprintf(extension->overlay, sizeof(extension->overlay), "overlay%d.dtbo", i);
+		snprintf(extension->name, sizeof(extension->name), "extension board %d", i);
+		snprintf(extension->owner, sizeof(extension->owner), "sandbox");
+		snprintf(extension->version, sizeof(extension->version), "1.1");
+		snprintf(extension->other, sizeof(extension->other), "Fictionnal extension board");
+		list_add_tail(&extension->list, extension_list);
+	}
+
+	return i;
+}
+#endif
+
 #ifdef CONFIG_BOARD_LATE_INIT
 int board_late_init(void)
 {
--- a/board/thead/light-c910/Kconfig
+++ b/board/thead/light-c910/Kconfig
@@ -86,10 +86,6 @@ config LIGHT_SEC_BOOT_WITH_VERIFY_LPI4A
    bool "light lpi4a security boot with verification"
    default n

-config LIGHT_SEC_BOOT_WITH_VERIFY_RVBOOK
-    bool "light lpi4a security boot with verification"
-    default n
-
 config TARGET_LIGHT_FPGA_FM_C910
    bool "light fullmask FPGA board"
    default n
@@ -130,21 +126,21 @@ config TARGET_LIGHT_FM_C910_LPI4A
    bool "light fullmask for Lichee Pi 4A board "
    default n

-config TARGET_LIGHT_FM_C910_RVBOOK
-    bool "light fullmask for RVBOOK board "
-    default n
-
 config TARGET_LIGHT_FM_C910_B_POWER
    bool "light fullmask for light-b-power board "
    default n

+config TARGET_LIGHT_FM_C910_MILKV_MELES
+    bool "light fullmask for Milk-V Meles board "
+    default n
+
 config SYS_TEXT_BASE
    default 0xc0000000 if RISCV_MMODE
    default 0x00200000 if RISCV_SMODE

 config SPL_TEXT_BASE
    hex
-    default 0xffe0000800
+    default 0xffe0000000

 config SPL_MAX_SIZE
    hex
--- a/board/thead/light-c910/Makefile
+++ b/board/thead/light-c910/Makefile
@@ -7,10 +7,6 @@ DDR_SRC_PATH=lpddr4/src
 DDR_REGU_SRC=lpddr-regu
 DDR_FW_PATH=$(DDR_SRC_PATH)/ddr_phy_fw

-ifdef CONFIG_RV_BOOK
-obj-y += sys_clk.o
-endif
-
 ifdef CONFIG_SPL_BUILD
 obj-y += spl.o
 obj-y += sys_clk.o
--- a/board/thead/light-c910/board.c
+++ b/board/thead/light-c910/board.c
@@ -10,6 +10,7 @@
 #include <usb.h>
 #include <usb/xhci.h>
 #include <cpu_func.h>
+#include <asm/gpio.h>
 #include <abuf.h>
 #include "sec_library.h"

@@ -21,11 +22,7 @@

 #ifdef CONFIG_USB_DWC3
 static struct dwc3_device dwc3_device_data = {
-#ifdef CONFIG_RV_BOOK
-	.maximum_speed = USB_SPEED_HIGH,
-#else
 	.maximum_speed = USB_SPEED_SUPER,
-#endif
 	.dr_mode = USB_DR_MODE_PERIPHERAL,
 	.index = 0,
 };
@@ -249,6 +246,35 @@ int do_bootslave(cmd_tbl_t * cmdtp, int flag, int argc, char * const argv[])
 }
 #endif

+static void light_c910_set_gpio_output_high(void)
+{
+	ofnode node;
+	struct gpio_desc select_gpio;
+
+	printf("%s: trying to set gpio output high\n", __func__);
+
+	node = ofnode_path("/config");
+	if (!ofnode_valid(node)) {
+		printf("%s: no /config node?\n", __func__);
+		return;
+	}
+
+	if (gpio_request_by_name_nodev(node, "select-gpio", 0,
+				       &select_gpio, GPIOD_IS_OUT)) {
+		printf("%s: could not find a /config/select-gpio\n", __func__);
+		return;
+	}
+
+	dm_gpio_set_value(&select_gpio, 1);
+}
+
+int misc_init_r(void)
+{
+	light_c910_set_gpio_output_high();
+
+	return 0;
+}
+
 #ifdef CONFIG_BOARD_RNG_SEED
 const char pre_gen_seed[128] = {211, 134, 226, 116, 1, 13, 224, 196, 88, 213, 188, 219, 128, 41, 231, 228, 129, 123, 173, 234, 219, 79, 152, 154, 169, 27, 183, 166, 52, 21, 118, 7, 155, 89, 124, 156, 102, 92, 96, 190, 49, 28, 154, 177, 69, 129, 149, 199, 253, 66, 177, 216, 146, 73, 114, 59, 100, 41, 225, 152, 62, 88, 160, 217, 177, 28, 117, 23, 120, 213, 213, 169, 242, 111, 90, 55, 241, 239, 254, 238, 50, 175, 198, 196, 248, 56, 255, 92, 97, 224, 245, 160, 56, 149, 121, 233, 177, 239, 0, 41, 196, 214, 210, 182, 69, 44, 238, 54, 27, 236, 36, 77, 156, 234, 17, 148, 34, 16, 241, 132, 241, 230, 36, 41, 123, 157, 19, 44};
 /* Use hardware rng to seed Linux random. */
--- a/board/thead/light-c910/boot.c
+++ b/board/thead/light-c910/boot.c
@@ -15,7 +15,6 @@
 #include "../../../lib/sec_library/include/sec_crypto_sha.h"
 #include "../../../lib/sec_library/include/kdf.h"
 #include "../../../lib/sec_library/include/sec_crypto_mac.h"
-#include "fastboot.h"

 #if CONFIG_IS_ENABLED(LIGHT_SEC_UPGRADE)

@@ -25,14 +24,6 @@
 /* The macro is used to enable uboot version in efuse */
 #define	LIGHT_UBOOT_VERSION_IN_ENV	1

-/* The macro is used to enable secimg version in env */
-#define LIGHT_SECIMG_VERSION_IN_ENV 1
-
-/* vimage return value */
-#define VIMAGE_UPGRADE_NOT_REQUIRED  1
-#define VIMAGE_BREAK_VERSION_RULE_ERROR  2
-#define VIMAGE_SIGNATRE_VERIFICATION_FAILED  3
-
 /* The macro is used to enble RPMB ACCESS KEY from KDF */
 //#define LIGHT_KDF_RPMB_KEY	1

@@ -47,8 +38,7 @@ static const unsigned char emmc_rpmb_key_sample[32] = {0x33, 0x22, 0x11, 0x00, 0
 												0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff};
 #endif
 static unsigned int upgrade_image_version = 0;
-static char *current_slot = "a";
-static char *update_slot = "b";
+
 #define RPMB_EMMC_CID_SIZE 16
 #define RPMB_CID_PRV_OFFSET             9
 #define RPMB_CID_CRC_OFFSET             15
@@ -56,8 +46,8 @@ static char *update_slot = "b";
 static int tee_rpmb_key_gen(uint8_t* key, uint32_t * length)
 {
 	uint32_t data[RPMB_EMMC_CID_SIZE / 4];
-	uint8_t huk[32];
-	uint32_t huk_len;
+    uint8_t huk[32];
+    uint32_t huk_len;
 	struct mmc *mmc = find_mmc_device(0);
 	int i;
 	sc_mac_t mac_handle;
@@ -82,14 +72,14 @@ static int tee_rpmb_key_gen(uint8_t* key, uint32_t * length)
 	memset((void *)((uint64_t)data + RPMB_CID_PRV_OFFSET), 0, 1);
 	memset((void *)((uint64_t)data + RPMB_CID_CRC_OFFSET), 0, 1);

-    	/* Step1: Derive HUK from KDF function */
+    /* Step1: Derive HUK from KDF function */
 	ret = csi_kdf_gen_hmac_key(huk, &huk_len);
 	if (ret) {
 		printf("kdf gen hmac key faild[%d]\r\n", ret);
 		return -1;
 	}

-    	/* Step2: Using HUK and data to generate RPMB key */
+    /* Step2: Using HUK and data to generate RPMB key */
 	ret = sc_mac_init(&mac_handle, 0);
 	if (ret) {
 		printf("mac init faild[%d]\r\n", ret);
@@ -162,25 +152,22 @@ int csi_rpmb_write_access_key(void)

 int csi_tf_get_image_version(unsigned int *ver)
 {
-	int ret = 0;
-#if !LIGHT_SECIMG_VERSION_IN_ENV
 	char runcmd[64] = {0};
 	unsigned char blkdata[256];
+	int ret = 0;
+
 	/* tf version reside in RPMB block#0, offset#16*/
 	sprintf(runcmd, "mmc rpmb read 0x%lx 0 1", (unsigned long)blkdata);
 	ret = run_command(runcmd, 0);
 	if (ret == 0) {
 		*ver = (blkdata[16] << 8) + blkdata[17];
 	}
-#else
-	*ver = env_get_hex("tf_version", 0);
-#endif
+
 	return ret;
 }

 int csi_tf_set_image_version(unsigned int ver)
 {
-#if !LIGHT_SECIMG_VERSION_IN_ENV
 	char runcmd[64] = {0};
 	unsigned char blkdata[256];
 	unsigned long *temp_rpmb_key_addr = NULL;
@@ -207,9 +194,7 @@ int csi_tf_set_image_version(unsigned int ver)

 	sprintf(runcmd, "mmc rpmb write 0x%lx 0 1 0x%lx", (unsigned long)blkdata, (unsigned long)temp_rpmb_key_addr);
 	run_command(runcmd, 0);
-#else
-	env_set_hex("tf_version", ver);
-#endif
+
 	return 0;
 }

@@ -220,19 +205,17 @@ int csi_tf_set_upgrade_version(void)

 int csi_tee_get_image_version(unsigned int *ver)
 {
-	int ret = 0;
-#if !LIGHT_SECIMG_VERSION_IN_ENV
 	char runcmd[64] = {0};
 	unsigned char blkdata[256];
+	int ret = 0;
+
 	/* tf version reside in RPMB block#0, offset#0*/
 	sprintf(runcmd, "mmc rpmb read 0x%lx 0 1", (unsigned long)blkdata);
 	ret = run_command(runcmd, 0);
 	if (ret == 0) {
 		*ver = (blkdata[0] << 8) + blkdata[1];
 	}
-#else
-	*ver = env_get_hex("tee_version", 0);
-#endif
+
 	return ret;
 }

@@ -251,7 +234,6 @@ int csi_kernel_get_image_version(unsigned int *ver)

 int csi_tee_set_image_version(unsigned int ver)
 {
-#if !LIGHT_SECIMG_VERSION_IN_ENV
 	char runcmd[64] = {0};
 	unsigned char blkdata[256];
 	unsigned long *temp_rpmb_key_addr = NULL;
@@ -277,9 +259,7 @@ int csi_tee_set_image_version(unsigned int ver)
 #endif
 	sprintf(runcmd, "mmc rpmb write 0x%lx 0 1 0x%lx", (unsigned long)blkdata, (unsigned long)temp_rpmb_key_addr);
 	run_command(runcmd, 0);
-#else
-	env_set_hex("tee_version", ver);
-#endif
+
 	return 0;
 }

@@ -290,25 +270,22 @@ int csi_tee_set_upgrade_version(void)

 int csi_sbmeta_get_image_version(unsigned int *ver)
 {
-	int ret = 0;
-#if !LIGHT_SECIMG_VERSION_IN_ENV
 	char runcmd[64] = {0};
 	unsigned char blkdata[256];
+	int ret = 0;
+
 	/* sbmeta version reside in RPMB block#0, offset#48*/
 	sprintf(runcmd, "mmc rpmb read 0x%lx 0 1", (unsigned long)blkdata);
 	ret = run_command(runcmd, 0);
 	if (ret == 0) {
 		*ver = (blkdata[48] << 8) + blkdata[49];
 	}
-#else
-	*ver = env_get_hex("sbmeta_version", 0);
-#endif
+
 	return ret;
 }

 int csi_sbmeta_set_image_version(unsigned int ver)
 {
-#if !LIGHT_SECIMG_VERSION_IN_ENV
 	char runcmd[64] = {0};
 	unsigned char blkdata[256];
 	unsigned long *temp_rpmb_key_addr = NULL;
@@ -333,9 +310,7 @@ int csi_sbmeta_set_image_version(unsigned int ver)
 #endif
 	sprintf(runcmd, "mmc rpmb write 0x%lx 0 1 0x%lx", (unsigned long)blkdata, (unsigned long)temp_rpmb_key_addr);
 	run_command(runcmd, 0);
-#else
-	env_set_hex("sbmeta_version", ver);
-#endif
+
 	return 0;
 }

@@ -463,13 +438,13 @@ int verify_image_version_rule(unsigned int new_ver, unsigned int cur_ver)
 		/* This is unsecure function */
 		if ((new_ver_y - cur_ver_y) == 0) {
 			printf("New version is equal to Current version, upgrade process terminates \n\n\n");
-			return VIMAGE_UPGRADE_NOT_REQUIRED;
+			return -1;
 		}
 		printf("This is unsecure function upgrade, going on uprade anyway\n");
 	} else if ((new_ver_x - cur_ver_x) != 1) {
 		/* Check the seure version rule */
 		printf("The upgrade version(X) breaks against the rule\n\n\n");
-		return VIMAGE_BREAK_VERSION_RULE_ERROR;
+		return -1;
 	}
 	printf("check image verison rule pass\n\n\n");

@@ -585,7 +560,7 @@ int light_vimage(int argc, char *const argv[])
 	unsigned long vimage_addr = 0;
 	unsigned int new_img_version = 0;
 	unsigned int cur_img_version = 0;
-	char imgname[32] = {0};
+    char imgname[32] = {0};

 	if (argc < 3)
 		return CMD_RET_USAGE;
@@ -600,43 +575,35 @@ int light_vimage(int argc, char *const argv[])
 		printf("get new img version fail\n");
 		return CMD_RET_FAILURE;
 	}
-	if (strcmp(imgname, UBOOT_PART_NAME) == 0) {
-		new_img_version = (((new_img_version & 0xff )+1) << 8) | ((new_img_version & 0xff00)>>8);
-	}
+    if (strcmp(imgname, UBOOT_PART_NAME) == 0) {
+        new_img_version = (((new_img_version & 0xff )+1) << 8) | ((new_img_version & 0xff00)>>8);
+    }
 	printf("Get new image version from image header: v%d.%d\n", (new_img_version & 0xff00)>>8, new_img_version & 0xff);

-	/* Check image version for ROLLBACK resisance */
+	/* Check image version for ROLLBACK resisance */ 
 	if (strcmp(imgname, TF_PART_NAME) == 0) {
+		
 		ret = csi_tf_get_image_version(&cur_img_version);
 		if (ret != 0) {
 			printf("Get tf img version fail\n");
 			return CMD_RET_FAILURE;
 		}
-#if LIGHT_NON_COT_BOOT
-		/* if in non-cot mode, tf and tee will not be signed at first */
-		if (image_have_head(vimage_addr) == 0 && ((cur_img_version & 0xFF00) >> 8 == 0)) {
-			return VIMAGE_UPGRADE_NOT_REQUIRED;
-		}
-#endif
 	} else if (strcmp(imgname, TEE_PART_NAME) == 0){
+
 		ret = csi_tee_get_image_version(&cur_img_version);
 		if (ret != 0) {
 			printf("Get tee img version fail\n");
 			return CMD_RET_FAILURE;
 		}
-#if LIGHT_NON_COT_BOOT
-		/* if in non-cot mode, tf and tee will not be signed at first */
-		if (image_have_head(vimage_addr) == 0 && ((cur_img_version & 0xFF00) >> 8 == 0)) {
-			return VIMAGE_UPGRADE_NOT_REQUIRED;
-		}
-#endif
 	} else if (strcmp(imgname, KERNEL_PART_NAME) == 0){
+
 		ret = csi_kernel_get_image_version(&cur_img_version);
 		if (ret != 0) {
 			printf("Get kernel img version fail\n");
 			return CMD_RET_FAILURE;
 		}
 	} else if (strcmp(imgname, SBMETA_PART_NAME) == 0){
+
 		ret = csi_sbmeta_get_image_version(&cur_img_version);
 		if (ret != 0) {
 			printf("Get sbmeta img version fail\n");
@@ -659,13 +626,13 @@ int light_vimage(int argc, char *const argv[])
 		printf("unsupport image file\n");
 		return CMD_RET_FAILURE;
 	}
-
+	
 	/* Verify image version rule */
 	ret = verify_image_version_rule(new_img_version, cur_img_version);
 	if (ret != 0) {
-                return ret;
+		return CMD_RET_FAILURE;
 	}
-
+	
 	/* Save new image version to allow caller upgrade image version */
 	upgrade_image_version = new_img_version;

@@ -679,27 +646,27 @@ int light_vimage(int argc, char *const argv[])
 	if (strcmp(imgname, TF_PART_NAME) == 0) {
 		ret = verify_customer_image(T_TF, vimage_addr);
 		if (ret != 0) {
-			return VIMAGE_SIGNATRE_VERIFICATION_FAILED;
+			return CMD_RET_FAILURE;
 		}
 	} else if (strcmp(imgname, TEE_PART_NAME) == 0) {
 		ret = verify_customer_image(T_TEE, vimage_addr);
 		if (ret != 0) {
-			return VIMAGE_SIGNATRE_VERIFICATION_FAILED;
+			return CMD_RET_FAILURE;
 		}
 	} else if (strcmp(imgname, KERNEL_PART_NAME) == 0) {
 		ret = verify_customer_image(T_KRLIMG, vimage_addr);
 		if (ret != 0) {
-			return VIMAGE_SIGNATRE_VERIFICATION_FAILED;
+			return CMD_RET_FAILURE;
 		}
 	} else if (strcmp(imgname, UBOOT_PART_NAME) == 0) {
 		ret = verify_customer_image(T_UBOOT, vimage_addr);
 		if (ret != 0) {
-			return VIMAGE_SIGNATRE_VERIFICATION_FAILED;
+			return CMD_RET_FAILURE;
 		}
 	} else if (strcmp(imgname, SBMETA_PART_NAME) == 0) {
 		ret = verify_customer_image(T_SBMETA, vimage_addr);
 		if (ret != 0) {
-			return VIMAGE_SIGNATRE_VERIFICATION_FAILED;
+			return CMD_RET_FAILURE;
 		}
 	} else {
 		printf("Error: unknow image name\n");
@@ -720,8 +687,8 @@ int light_secboot(int argc, char * const argv[])
 	printf("\n\n");
 	printf("Now, we start to verify all trust firmware before boot kernel !\n");

-	/* Enject RPMB KEY directly in startup */
-	csi_rpmb_write_access_key();
+    /* Enject RPMB KEY directly in startup */
+    csi_rpmb_write_access_key();

 	/* Initialize secure basis of functions */
 	ret = csi_sec_init();
@@ -858,317 +825,273 @@ void sec_firmware_version_dump(void)
 	printf("\n\n");
 }

-struct sec_img_upgrade_entry {
-	const char* filename;
-	const char* imgtype;
-	int (*set_version_func)(void);
-	const char *part_str;
-};
-
-static struct sec_img_upgrade_entry sec_img_list[] = {
-	{"sbmeta.bin", "sbmeta", csi_sbmeta_set_upgrade_version, "sbmeta"},
-	{"trust_firmware.bin", "tf", csi_tf_set_upgrade_version, "tee"},
-	{"tee.bin", "tee", csi_tee_set_upgrade_version, "tee"},
-        {NULL, NULL, NULL, NULL},
-};
-
-static struct blk_desc *dev_desc;
-static int ab_get_blk(void)
-{
-        struct disk_partition part_info;
-        dev_desc = blk_get_dev("mmc", CONFIG_FASTBOOT_FLASH_MMC_DEV);
-	if (dev_desc == NULL) {
-		printf("Failed to find MMC device\n");
-		return -1;
-	}
-        return 0;
-}
-
-static int ab_get_sec_part(const char *part_str, int update_part)
-{
-	struct disk_partition part_info;
-        char partname[10] = {0};
-        int part = 0;
-
-        if (update_part) {
-                sprintf(partname, "%s_%s", part_str, update_slot);
-        } else {
-                sprintf(partname, "%s_%s", part_str, current_slot);
-        }
-
-        part = part_get_info_by_name(dev_desc, partname, &part_info);
-        if (part < 0) {
-		printf("Failed to find MMC device\n");
-	}
-
-        return part;
-}
-
-static int single_img_upgrade(struct sec_img_upgrade_entry *sec_img_entry)
+void sec_upgrade_thread(void)
 {
 	const unsigned long temp_addr=0x200000;
 	char runcmd[80];
-	uint8_t * image_buffer = NULL;
-	uint8_t * image_malloc_buffer = NULL;
-	unsigned int upgrade_file_size = 0;
-	const char *filename = NULL;
-	int update_part = 0;
-        int current_part = 0;
+    uint8_t * image_buffer = NULL;
+    uint8_t * image_malloc_buffer = NULL;
 	int ret = 0;
-        char *argv[3] = {"vimage", NULL, NULL};
-
-	if (sec_img_entry == NULL) {
-		return -1;
-	}
-
-	update_part = ab_get_sec_part(sec_img_entry->part_str, 1);
-        if (update_part < 0) {
-                return -1;
-        }
-
-	filename = sec_img_entry->filename;
-
-	/* STEP 1: read upgrade image from storage */
-	printf("read upgrade image (%s) from storage \n", filename);
-	sprintf(runcmd, "ext4load mmc ${mmcdev}:%x 0x%p %s", update_part, (void *)temp_addr, filename);
-	printf("runcmd:%s\n", runcmd);
-	ret = run_command(runcmd, 0);
-	if (ret != 0) {
-		printf("%s upgrade process is terminated due to some reason\n", filename);
-		return -1;
-	}
-	/* Fetch the total file size after read out operation end */
-	upgrade_file_size = env_get_hex("filesize", 0);
-	printf("upgrade file size: %d\n", upgrade_file_size);
-
-	/*store image to temp buffer as temp_addr may be decrypted*/
-	image_malloc_buffer = malloc(upgrade_file_size);
-	if (image_malloc_buffer == NULL) {
-		image_buffer = (uint8_t*)temp_addr + upgrade_file_size;
-	} else {
-		image_buffer = image_malloc_buffer;
-	}
-	memcpy(image_buffer, (void*)temp_addr, upgrade_file_size);
-
-	/* STEP 2: verify secure image */
-        sprintf(runcmd, "0x%lx", temp_addr);
-        argv[1] = runcmd;
-        argv[2] = sec_img_entry->imgtype;
-        ret = light_vimage(3, argv);
-        if (ret == VIMAGE_UPGRADE_NOT_REQUIRED) {
-                printf("%s Image may not need upgrade\n", sec_img_entry->imgtype);
-                return 0;
-        } else if (ret != 0) {
-                return -1;
-        }
-
-	/* STEP 3: update partition image in another slot */
-        current_part = ab_get_sec_part(sec_img_entry->part_str, 0);
-        if (current_part < 0) {
-                return -1;
-        }
-	printf("write upgrade image (%s) into another slot \n", filename);
-	sprintf(runcmd, "ext4write mmc 0:%x 0x%p /%s 0x%x", current_part, (void *)image_buffer, filename, upgrade_file_size);
-	printf("runcmd:%s\n", runcmd);
-	ret = run_command(runcmd, 0);
-	if (ret != 0) {
-		printf("%s upgrade process is terminated due to some reason\n", filename);
-		return -1;
-	}
-
-	/* STEP 4: update secure image version */
-        sec_img_entry->set_version_func();
-
-	printf("\n\n%s image ugprade process is successful\n\n", filename);
-	return 0;
-}
-
-static int sec_img_upgrade(void)
-{
-        int ret = 0;
-        struct sec_img_upgrade_entry *sec_img_entry = sec_img_list;
-
-        ab_get_blk();
-
-        while (sec_img_entry->filename != NULL) {
-                ret = single_img_upgrade(sec_img_entry);
-                if (ret) {
-                        printf("Fail to upgrade image\n");
-                        return -1;
-                }
-
-                sec_img_entry++;
-        }
-	return 0;
-}
-
-extern int hibernate_image_cleaned_flag;
-extern void clean_hibernate_image_header(char *response);
-static char *response[FASTBOOT_RESPONSE_LEN] = {0};
-void sec_upgrade_thread(void)
-{
-        const unsigned long temp_addr=0x200000;
-        char runcmd[80];
-        int ret = 0;
-        unsigned int sec_upgrade_flag = 0;
-        unsigned int upgrade_file_size = 0;
-
-        sec_upgrade_flag = env_get_hex("sec_upgrade_mode", 0);
-        current_slot = env_get("slot_suffix");
-        update_slot = strcmp(current_slot, "a") == 0 ? "b" : "a";
-
-        if (sec_upgrade_flag == 0) {
-		return;
-        }
-
-	clean_hibernate_image_header(response);
-        printf("bootstrap: sec_upgrade_flag: %x\n", sec_upgrade_flag);
-        if (sec_upgrade_flag == UBOOT_SEC_UPGRADE_FLAG) {
-                unsigned int block_cnt;
-                struct blk_desc *dev_desc;
-                const unsigned long uboot_temp_addr=0x80000000;
-                #define BLOCK_SIZE 512
-                #define PUBKEY_HEADER_SIZE	0x1000
-
-                /* STEP 1: read upgrade image (u-boot-with-spl.bin) from stash partition */
-                printf("read upgrade image (u-boot-with-spl.bin) from stash partition \n");
-                sprintf(runcmd, "ext4load mmc 0:4 0x%p u-boot-with-spl.bin", (void *)temp_addr);
-                printf("runcmd:%s\n", runcmd);
-                ret = run_command(runcmd, 0);
-                if (ret != 0) {
-                        printf("UBOOT Upgrade process is terminated due to some reason\n");
-                        goto _upgrade_uboot_exit;
-                }
-
-                /* Fetch the total file size after read out operation end */
-                upgrade_file_size = env_get_hex("filesize", 0);
-                printf("uboot upgrade file size: %d\n", upgrade_file_size);
-
-                /* STEP 2: verify its authentiticy here */
-                memmove((void *)uboot_temp_addr, (const void *)temp_addr, upgrade_file_size);
-                sprintf(runcmd, "vimage 0x%p uboot", (void *)(uboot_temp_addr+PUBKEY_HEADER_SIZE));
-                printf("runcmd:%s\n", runcmd);
-                ret = run_command(runcmd, 0);
-                if (ret != 0) {
-                        printf("UBOOT Image verification fail and upgrade process terminates\n");
-                        goto _upgrade_uboot_exit;
-                }
-
-                /* STEP 3: update uboot partition */
-                printf("write upgrade image (u-boot-with-spl.bin) into uboot partition \n");
-                dev_desc = blk_get_dev("mmc", CONFIG_FASTBOOT_FLASH_MMC_DEV);
-                if (!dev_desc || dev_desc->type == DEV_TYPE_UNKNOWN) {
-                        printf("Invalid mmc device\n");
-                        goto _upgrade_uboot_exit;
-                }
-                block_cnt = upgrade_file_size / BLOCK_SIZE;
-                if (upgrade_file_size % BLOCK_SIZE) {
-                        block_cnt = block_cnt +1;
-                }
-
-                run_command("mmc partconf 0 1 0 1", 0);
-                sprintf(runcmd, "mmc write 0x%p 0 %x", (void *)temp_addr, block_cnt);
-                printf("runcmd:%s\n", runcmd);
-                ret = run_command(runcmd, 0);
-                run_command("mmc partconf 0 1 0 0", 0);
-                if (ret != 0) {
-                        printf("UBOOT upgrade process is terminated due to some reason\n");
-                        goto _upgrade_uboot_exit;
-                }
-
-                /* STEP 4: update tee version */
-                ret = csi_uboot_set_upgrade_version();
-                if (ret != 0) {
-                        printf("Set uboot upgrade version fail\n");
-                        goto _upgrade_uboot_exit;
-                }
-
-                printf("\n\nUBOOT image ugprade process is successful\n\n");
-_upgrade_uboot_exit:
-                /* set secure upgrade flag to 0 that indicate upgrade over */
-                run_command("env set sec_upgrade_mode 0", 0);
-                run_command("saveenv", 0);
-                run_command("reset", 0);
-        } else if ((sec_upgrade_flag >> 16) == SEC_IMG_UPGRADE_FLAG) {
-                ret = sec_img_upgrade();
-                if (ret) {
-                        printf("secure image upgrade failed\n");
-                        /* if failed, clear upgrade flag, terminate upgradation */
-                        sec_upgrade_flag = 0;
-                } else  {
-                        /* if succeed, clear secure flag */
-                        sec_upgrade_flag = sec_upgrade_flag & 0x0000FFFF;
-                        /* if boot need not update, switch current slot to update slot */
-                        if ((sec_upgrade_flag & 0xFF00) != BOOT_IMG_UPGRADE_FLAG) {
-                                sprintf(runcmd, "env set slot_suffix %s", update_slot);
-                                run_command(runcmd, 0);
-                        }
-                }
-                /* set upgrade flag */
-                sprintf(runcmd, "env set sec_upgrade_mode %x", sec_upgrade_flag);
-                run_command(runcmd, 0);
-
-                run_command("saveenv", 0);
-                run_command("reset", 0);
-        } else if (((sec_upgrade_flag & 0xFF00) != BOOT_IMG_UPGRADE_FLAG) &&
-			((sec_upgrade_flag & 0xFF) != ROOT_IMG_UPGRADE_FLAG)) {
-                printf("Unknown bootstrap, Force sysem reboot\n");
-                run_command("env set sec_upgrade_mode 0", 0);
-                run_command("saveenv", 0);
-                run_command("reset", 0);
-        }
-}
-
-void nonsec_upgrade_thread(void)
-{
-	unsigned int sec_upgrade_flag;
-	unsigned long retries;
-        char runcmd[32] = {0};
+	unsigned int sec_upgrade_flag = 0;
+	unsigned int upgrade_file_size = 0;

 	sec_upgrade_flag = env_get_hex("sec_upgrade_mode", 0);
-	retries = env_get_ulong("retries", 10, 5);
-        if (sec_upgrade_flag == 0) {
-		if (retries < 5 && retries > 0) {
-			printf("boot upgradation is successful!\n");
-                	run_command("env set retries 5", 0);
-                	run_command("env save", 0);
+	if (sec_upgrade_flag == 0)
+		return;
+	printf("bootstrap: sec_upgrade_flag: %x\n", sec_upgrade_flag);
+	if (sec_upgrade_flag == TF_SEC_UPGRADE_FLAG) {
+		/* STEP 1: read upgrade image (trust_firmware.bin) from stash partition */
+		printf("read upgrade image (trust_firmware.bin) from stash partition \n");
+		sprintf(runcmd, "ext4load mmc 0:4 0x%p trust_firmware.bin", (void *)temp_addr);
+		printf("runcmd:%s\n", runcmd);
+		ret = run_command(runcmd, 0);
+		if (ret != 0) {
+			printf("TF upgrade process is terminated due to some reason\n");
+			goto _upgrade_tf_exit;
 		}
-                return;
+		/* Fetch the total file size after read out operation end */
+		upgrade_file_size = env_get_hex("filesize", 0);
+		printf("upgrade file size: %d\n", upgrade_file_size);
+
+        /*store image to temp buffer as temp_addr may be decrypted*/
+        image_malloc_buffer = malloc(upgrade_file_size);
+        if ( image_malloc_buffer == NULL ) {
+			image_buffer = (uint8_t*)temp_addr + upgrade_file_size;
+		} else {
+            image_buffer = image_malloc_buffer;
        }
+        memcpy(image_buffer, (void*)temp_addr, upgrade_file_size);

-	/* when sec_upgrade_mode != 0 and the first time try to boot. switch current slot to update slot*/
-	if (retries == 5) {
-		printf("upgrade images are in slot %s...\n", update_slot);
-		sprintf(runcmd, "env set slot_suffix %s", update_slot);
-		run_command(runcmd, 0);
-	}
-	/* if ROOT image need upgrade, clear flag */
-	if ((sec_upgrade_flag & 0xFF) == ROOT_IMG_UPGRADE_FLAG) {
-		printf("in root image upgrade process...\n");
-		sec_upgrade_flag = sec_upgrade_flag & 0xFF00;
-		sprintf(runcmd, "env set sec_upgrade_mode %X", sec_upgrade_flag);
-		run_command(runcmd, 0);
-	}
-
-	/* if boot image need upgrade, decrement retries */
-	if ((sec_upgrade_flag & 0xFF00) == BOOT_IMG_UPGRADE_FLAG) {
-		printf("in boot image upgrade process...\n");
-		retries--;
-                printf("remaining retry times: %ld\n", retries);
-		if (retries == 0 || retries > 5) {
-			/*
-                         * upgrade failed. Now updated images are in current slot
-                         * switch to original slot
-                         */
-                        printf("boot images upgrade failed. switch slot to %s...\n", update_slot);
-                        sprintf(runcmd, "env set slot_suffix %s", update_slot);
-                        run_command(runcmd, 0);
-			run_command("env set sec_upgrade_mode 0", 0);
-			retries = 5;
+		/* STEP 2: verify its authentiticy here */
+		sprintf(runcmd, "vimage 0x%p tf", (void *)temp_addr);
+		printf("runcmd:%s\n", runcmd);
+		ret = run_command(runcmd, 0);
+		if (ret != 0) {
+			printf("TF Image verification fail and upgrade process terminates\n");
+			goto _upgrade_tf_exit;
 		}
-                sprintf(runcmd, "env set retries %ld", retries);
-                run_command(runcmd, 0);
-                run_command("env save", 0);
+
+		/* STEP 3: update tf partition */
+		printf("read upgrade image (trust_firmware.bin) into tf partition \n");
+		sprintf(runcmd, "ext4write mmc 0:3 0x%p /trust_firmware.bin 0x%x", (void *)image_buffer, upgrade_file_size);
+		printf("runcmd:%s\n", runcmd);
+		ret = run_command(runcmd, 0);
+		if (ret != 0) {
+			printf("TF upgrade process is terminated due to some reason\n");
+			goto _upgrade_tf_exit;
+		}
+
+		/* STEP 4: update tf version */
+		ret = csi_tf_set_upgrade_version();
+		if (ret != 0) {
+			printf("Set trustfirmware upgrade version fail\n");
+			goto _upgrade_tf_exit;
+		}
+
+		printf("\n\nTF image ugprade process is successful\n\n");
+_upgrade_tf_exit:
+		/* set secure upgrade flag to 0 that indicate upgrade over */
+		run_command("env set sec_upgrade_mode 0", 0);
+		run_command("saveenv", 0);
+		run_command("reset", 0);
+
+        if ( image_malloc_buffer != NULL ) {
+            free(image_malloc_buffer);
+            image_malloc_buffer = NULL;
+        }
+	} else if (sec_upgrade_flag == TEE_SEC_UPGRADE_FLAG) {
+
+ 		/* STEP 1: read upgrade image (tee.bin) from stash partition */
+		printf("read upgrade image (tee.bin) from stash partition \n");
+		sprintf(runcmd, "ext4load mmc 0:4 0x%p tee.bin", (void *)temp_addr);
+		printf("runcmd:%s\n", runcmd);
+		ret = run_command(runcmd, 0);
+		if (ret != 0) {
+			printf("TEE Upgrade process is terminated due to some reason\n");
+			goto _upgrade_tee_exit;
+		}
+		/* Fetch the total file size after read out operation end */
+		upgrade_file_size = env_get_hex("filesize", 0);
+		printf("TEE upgrade file size: %d\n", upgrade_file_size);
+
+        /*store image to temp buffer as temp_addr may be decrypted*/
+        image_malloc_buffer = malloc(upgrade_file_size);
+        if ( image_malloc_buffer == NULL ) {
+			image_buffer = (uint8_t*)temp_addr + upgrade_file_size;
+		} else {
+            image_buffer = image_malloc_buffer;
+        }
+        memcpy(image_buffer, (void*)temp_addr, upgrade_file_size);
+
+		/* STEP 2: verify its authentiticy here */
+		sprintf(runcmd, "vimage 0x%p tee", (void *)temp_addr);
+		printf("runcmd:%s\n", runcmd);
+		ret = run_command(runcmd, 0);
+		if (ret != 0) {
+			printf("TEE Image verification fail and upgrade process terminates\n");
+			goto _upgrade_tee_exit;
+		}
+
+		/* STEP 3: update tee partition */
+		printf("read upgrade image (tee.bin) into sbmeta partition \n");
+		sprintf(runcmd, "ext4write mmc 0:3 0x%p /tee.bin 0x%x", (void *)image_buffer, upgrade_file_size);
+		printf("runcmd:%s\n", runcmd);
+		ret = run_command(runcmd, 0);
+		if (ret != 0) {
+			printf("TEE upgrade process is terminated due to some reason\n");
+			goto _upgrade_tee_exit;
+		}
+
+		/* STEP 4: update tee version */
+		ret = csi_tee_set_upgrade_version();
+		if (ret != 0) {
+			printf("Set tee upgrade version fail\n");
+			goto _upgrade_tee_exit;
+		}
+
+		printf("\n\nTEE image ugprade process is successful\n\n");
+_upgrade_tee_exit:
+		/* set secure upgrade flag to 0 that indicate upgrade over */
+		run_command("env set sec_upgrade_mode 0", 0);
+		run_command("saveenv", 0);
+		run_command("reset", 0);
+
+        if ( image_malloc_buffer != NULL ) {
+            free(image_malloc_buffer);
+            image_malloc_buffer = NULL;
+        }
+	} else if (sec_upgrade_flag == SBMETA_SEC_UPGRADE_FLAG) {
+
+ 		/* STEP 1: read upgrade image (sbmeta.bin) from stash partition */
+		printf("read upgrade image (sbmeta.bin) from stash partition \n");
+		sprintf(runcmd, "ext4load mmc 0:4 0x%p sbmeta.bin", (void *)temp_addr);
+		printf("runcmd:%s\n", runcmd);
+		ret = run_command(runcmd, 0);
+		if (ret != 0) {
+			printf("SBMETA Upgrade process is terminated due to some reason\n");
+			goto _upgrade_sbmeta_exit;
+		}
+		/* Fetch the total file size after read out operation end */
+		upgrade_file_size = env_get_hex("filesize", 0);
+		printf("SBMETA upgrade file size: %d\n", upgrade_file_size);
+
+        /*store image to temp buffer as temp_addr may be decrypted*/
+        image_malloc_buffer = malloc(upgrade_file_size);
+        if ( image_malloc_buffer == NULL ) {
+			image_buffer = (uint8_t*)temp_addr + upgrade_file_size;
+		} else {
+            image_buffer = image_malloc_buffer;
+        }
+        memcpy(image_buffer, (void*)temp_addr, upgrade_file_size);
+
+		/* STEP 2: verify its authentiticy here */
+		sprintf(runcmd, "vimage 0x%p sbmeta", (void *)temp_addr);
+		printf("runcmd:%s\n", runcmd);
+		ret = run_command(runcmd, 0);
+		if (ret != 0) {
+			printf("SBMETA Image verification fail and upgrade process terminates\n");
+			goto _upgrade_sbmeta_exit;
+		}
+
+		/* STEP 3: update sbmeta partition */
+		printf("read upgrade image (SBMETA.bin) into sbmeta partition \n");
+		sprintf(runcmd, "ext4write mmc 0:3 0x%p /sbmeta.bin 0x%x", (void *)image_buffer, upgrade_file_size);
+		printf("runcmd:%s\n", runcmd);
+		ret = run_command(runcmd, 0);
+		if (ret != 0) {
+			printf("SBMETA upgrade process is terminated due to some reason\n");
+			goto _upgrade_sbmeta_exit;
+		}
+
+		/* STEP 4: update sbmeta version */
+		ret = csi_sbmeta_set_upgrade_version();
+		if (ret != 0) {
+			printf("Set sbmeta upgrade version fail\n");
+			goto _upgrade_sbmeta_exit;
+		}
+
+		printf("\n\nSBMETA image ugprade process is successful\n\n");
+_upgrade_sbmeta_exit:
+		/* set secure upgrade flag to 0 that indicate upgrade over */
+		run_command("env set sec_upgrade_mode 0", 0);
+		run_command("saveenv", 0);
+		run_command("reset", 0);
+
+        if ( image_malloc_buffer != NULL ) {
+            free(image_malloc_buffer);
+            image_malloc_buffer = NULL;
+        }
+	} else if (sec_upgrade_flag == UBOOT_SEC_UPGRADE_FLAG) {
+		unsigned int block_cnt;
+		struct blk_desc *dev_desc;
+		const unsigned long uboot_temp_addr=0x80000000;
+		#define BLOCK_SIZE 512
+		#define PUBKEY_HEADER_SIZE	0x1000
+
+		/* STEP 1: read upgrade image (u-boot-with-spl.bin) from stash partition */
+		printf("read upgrade image (u-boot-with-spl.bin) from stash partition \n");
+		sprintf(runcmd, "ext4load mmc 0:4 0x%p u-boot-with-spl.bin", (void *)temp_addr);
+		printf("runcmd:%s\n", runcmd);
+		ret = run_command(runcmd, 0);
+		if (ret != 0) {
+			printf("UBOOT Upgrade process is terminated due to some reason\n");
+			goto _upgrade_uboot_exit;
+		}
+
+		/* Fetch the total file size after read out operation end */
+		upgrade_file_size = env_get_hex("filesize", 0);
+		printf("uboot upgrade file size: %d\n", upgrade_file_size);
+
+		/* STEP 2: verify its authentiticy here */
+		memmove((void *)uboot_temp_addr, (const void *)temp_addr, upgrade_file_size);
+		sprintf(runcmd, "vimage 0x%p uboot", (void *)(uboot_temp_addr+PUBKEY_HEADER_SIZE));
+		printf("runcmd:%s\n", runcmd);
+		ret = run_command(runcmd, 0);
+		if (ret != 0) {
+			printf("UBOOT Image verification fail and upgrade process terminates\n");
+			goto _upgrade_uboot_exit;
+		}
+
+		/* STEP 3: update uboot partition */
+		printf("write upgrade image (u-boot-with-spl.bin) into boot partition \n");
+		dev_desc = blk_get_dev("mmc", CONFIG_FASTBOOT_FLASH_MMC_DEV);
+        if (!dev_desc || dev_desc->type == DEV_TYPE_UNKNOWN) {
+			printf("Invalid mmc device\n");
+			goto _upgrade_uboot_exit;
+        }
+		block_cnt = upgrade_file_size / BLOCK_SIZE;
+		if (upgrade_file_size % BLOCK_SIZE) {
+			block_cnt = block_cnt +1;
+		}
+
+		run_command("mmc partconf 0 1 0 1", 0);
+		sprintf(runcmd, "mmc write 0x%p 0 %x", (void *)temp_addr, block_cnt);
+		printf("runcmd:%s\n", runcmd);
+		ret = run_command(runcmd, 0);
+		run_command("mmc partconf 0 1 0 0", 0);
+		if (ret != 0) {
+			printf("UBOOT upgrade process is terminated due to some reason\n");
+			goto _upgrade_uboot_exit;
+		}
+
+		/* STEP 4: update tee version */
+		ret = csi_uboot_set_upgrade_version();
+		if (ret != 0) {
+			printf("Set uboot upgrade version fail\n");
+			goto _upgrade_uboot_exit;
+		}
+
+		printf("\n\nUBOOT image ugprade process is successful\n\n");
+_upgrade_uboot_exit:
+		/* set secure upgrade flag to 0 that indicate upgrade over */
+		run_command("env set sec_upgrade_mode 0", 0);
+		run_command("saveenv", 0);
+		run_command("reset", 0);
+	} else {
+		printf("Unknown bootstrap, Force sysem reboot\n");
+		run_command("reset", 0);
 	}
 }
 #endif
+
+
--- a/board/thead/light-c910/clock_config.c
+++ b/board/thead/light-c910/clock_config.c
@@ -1146,7 +1146,7 @@ void ap_mipi_dsi1_clk_endisable(bool en)
 	writel(cfg1, (void __iomem *)AP_DPU1_PLL_CFG1);
 }

-#if defined (CONFIG_TARGET_LIGHT_FM_C910_VAL_ANT_DISCRETE) || defined (CONFIG_TARGET_LIGHT_FM_C910_BEAGLE) || defined (CONFIG_TARGET_LIGHT_FM_C910_B_REF) || defined (CONFIG_TARGET_LIGHT_FM_C910_VAL_ANT_REF) || defined (CONFIG_TARGET_LIGHT_FM_C910_B_POWER) || defined (CONFIG_TARGET_LIGHT_FM_C910_VAL_B)
+#if defined (CONFIG_TARGET_LIGHT_FM_C910_VAL_ANT_DISCRETE) || defined (CONFIG_TARGET_LIGHT_FM_C910_BEAGLE) || defined (CONFIG_TARGET_LIGHT_FM_C910_B_REF) || defined (CONFIG_TARGET_LIGHT_FM_C910_VAL_ANT_REF) || defined (CONFIG_TARGET_LIGHT_FM_C910_B_POWER) || defined (CONFIG_TARGET_LIGHT_FM_C910_VAL_B) || defined (CONFIG_TARGET_LIGHT_FM_C910_LPI4A) || defined (CONFIG_TARGET_LIGHT_FM_C910_MILKV_MELES)
 static void ap_multimedia_div_num_set(enum multimedia_div_type type, unsigned int div_num)
 {
 	unsigned long div_reg;
@@ -1305,7 +1305,7 @@ int clk_config(void)

 	/* The boards other than the LightA board perform the bus down-speed operation */

-#if defined (CONFIG_TARGET_LIGHT_FM_C910_VAL_ANT_DISCRETE) || defined (CONFIG_TARGET_LIGHT_FM_C910_BEAGLE) || defined (CONFIG_TARGET_LIGHT_FM_C910_B_REF) || defined (CONFIG_TARGET_LIGHT_FM_C910_VAL_ANT_REF) || defined (CONFIG_TARGET_LIGHT_FM_C910_B_POWER) || defined (CONFIG_TARGET_LIGHT_FM_C910_VAL_B)
+#if defined (CONFIG_TARGET_LIGHT_FM_C910_VAL_ANT_DISCRETE) || defined (CONFIG_TARGET_LIGHT_FM_C910_BEAGLE) || defined (CONFIG_TARGET_LIGHT_FM_C910_B_REF) || defined (CONFIG_TARGET_LIGHT_FM_C910_VAL_ANT_REF) || defined (CONFIG_TARGET_LIGHT_FM_C910_B_POWER) || defined (CONFIG_TARGET_LIGHT_FM_C910_VAL_B) || defined (CONFIG_TARGET_LIGHT_FM_C910_LPI4A) || defined (CONFIG_TARGET_LIGHT_FM_C910_MILKV_MELES)
 	ap_multimedia_div_num_set(VI_MIPI_CSI0_DIV, 12); /* Input frquency: 2376MHZ */
 	ap_multimedia_div_num_set(VI_ISP0_CORE_DIV, 12); /* Input frquency: 2376MHZ */
 	ap_multimedia_div_num_set(VI_ISP1_CORE_DIV, 12); /* Input frquency: 2376MHZ */
--- a/board/thead/light-c910/light.c
+++ b/board/thead/light-c910/light.c
--- a/board/thead/light-c910/lpddr-regu/ddr_regu.c
+++ b/board/thead/light-c910/lpddr-regu/ddr_regu.c
@@ -136,7 +136,7 @@ static const struct regulator_t g_apcpu_regu_id_list[] = {
 		REGU_ID_DEF(IIC_IDX_AONIIC,APCPU_REGU_VDDM,0x31,0x39,0,1,800000,600000,3500000,12500,1),
 	},
 };
-#elif defined (CONFIG_TARGET_LIGHT_FM_C910_VAL_ANT_REF) || defined (CONFIG_TARGET_LIGHT_FM_C910_A_REF) || defined (CONFIG_TARGET_LIGHT_FM_C910_B_REF) || (CONFIG_TARGET_LIGHT_FM_C910_BEAGLE) || defined (CONFIG_TARGET_LIGHT_FM_C910_LPI4A) || defined(CONFIG_TARGET_LIGHT_FM_C910_RVBOOK)
+#elif defined (CONFIG_TARGET_LIGHT_FM_C910_VAL_ANT_REF) || defined (CONFIG_TARGET_LIGHT_FM_C910_A_REF) || defined (CONFIG_TARGET_LIGHT_FM_C910_B_REF) || (CONFIG_TARGET_LIGHT_FM_C910_BEAGLE) || defined (CONFIG_TARGET_LIGHT_FM_C910_LPI4A) || defined (CONFIG_TARGET_LIGHT_FM_C910_MILKV_MELES)
 /**
 * board for ant-ref
 *
@@ -955,7 +955,7 @@ int pmic_reset_apcpu_voltage(void)
 		return ret;
 	return 0;
 }
-#elif defined (CONFIG_TARGET_LIGHT_FM_C910_VAL_ANT_REF) || defined (CONFIG_TARGET_LIGHT_FM_C910_A_REF) || defined (CONFIG_TARGET_LIGHT_FM_C910_B_REF)|| (CONFIG_TARGET_LIGHT_FM_C910_BEAGLE) || defined (CONFIG_TARGET_LIGHT_FM_C910_LPI4A) || defined(CONFIG_TARGET_LIGHT_FM_C910_RVBOOK)
+#elif defined (CONFIG_TARGET_LIGHT_FM_C910_VAL_ANT_REF) || defined (CONFIG_TARGET_LIGHT_FM_C910_A_REF) || defined (CONFIG_TARGET_LIGHT_FM_C910_B_REF)|| (CONFIG_TARGET_LIGHT_FM_C910_BEAGLE) || defined (CONFIG_TARGET_LIGHT_FM_C910_LPI4A) || defined (CONFIG_TARGET_LIGHT_FM_C910_MILKV_MELES)
 int pmic_reset_apcpu_voltage(void)
 {
 	int                ret = -1;
--- a/board/thead/light-c910/lpddr4/include/ddr_retention.h
+++ b/board/thead/light-c910/lpddr4/include/ddr_retention.h
@@ -28,8 +28,6 @@ typedef enum {
 typedef struct Ddr_Reg_Config {
    uint32_t misc_reg_num;
    uint32_t phy_reg_num;
-    uint8_t  ddr_rank;
-    uint8_t  reserve[55];
 } Ddr_Reg_Config_t;

 int dwc_ddrphy_phyinit_regInterface(regInstr myRegInstr);
--- a/board/thead/light-c910/lpddr4/src/ddr_common_func.c
+++ b/board/thead/light-c910/lpddr4/src/ddr_common_func.c
@@ -994,7 +994,7 @@ if(bits==64) {
 }
 }

-#define MEMSIZE_MIN_MB (1*1024)
+#define MEMSIZE_MIN_MB (2*1024)
 #define MEMSIZE_MAX_MB (16*1024)
 #define UNIT_MB (1024*1024)
 int lpddr4_query_boundary(enum DDR_TYPE type, int rank_num, int speed,
@@ -1007,29 +1007,35 @@ int lpddr4_query_boundary(enum DDR_TYPE type, int rank_num, int speed,
  if (bits == DDR_BITWIDTH_32) {// only phy0
    if (rank_num == 2) {
      if (size == 0x80000000) //2GB
-        goto ret_ok;
+        goto err_ret;
      else if (size == 0x100000000) //4GB
        goto ret_ok;
      else if (size == 0x200000000) //8GB
        goto ret_ok;
+      else if (size == 0x400000000) //16GB
+        goto err_ret;
      else
        goto err_ret;
    }
    else { // single rank
-      if (size == 0x40000000) //1GB
-        goto ret_ok;
-      else if (size == 0x80000000) //2GB
+      if (size == 0x80000000) //2GB
        goto ret_ok;
      else if (size == 0x100000000) //4GB
-        goto ret_ok;
+        goto err_ret;
+      else if (size == 0x200000000) //8GB
+        goto err_ret;
+      else if (size == 0x400000000) //16GB
+        goto err_ret;
      else
        goto err_ret;
    }
  }
  else if (bits == DDR_BITWIDTH_64) { // phy0+phy1
    if (rank_num == 2) {
-      if (size == 0x100000000) //4GB
-        goto ret_ok;
+      if (size == 0x80000000) //2GB
+        goto err_ret;
+      else if (size == 0x100000000) //4GB
+        goto err_ret;
      else if (size == 0x200000000) //8GB
        goto ret_ok;
      else if (size == 0x400000000) //16GB
@@ -1039,11 +1045,13 @@ int lpddr4_query_boundary(enum DDR_TYPE type, int rank_num, int speed,
    }
    else { // single rank
      if (size == 0x80000000) //2GB
-        goto ret_ok;
+        goto err_ret;
      else if (size == 0x100000000) //4GB
        goto ret_ok;
      else if (size == 0x200000000) //8GB
-        goto ret_ok;
+        goto err_ret;
+      else if (size == 0x400000000) //16GB
+        goto err_ret;
      else
        goto err_ret;
    }
@@ -1067,70 +1075,36 @@ int adjust_ddr_addrmap(enum DDR_TYPE type, int rank_num, int speed,

  if (bits == DDR_BITWIDTH_32) {// only phy0
    if (rank_num == 2) {
-      if (size == 0x80000000) {//2GB
-        wr(ADDRMAP0,0x001f0016); // cs_bit0: HIF[28]
-        wr(ADDRMAP6,0x0f070707); // row15: NULL
-        wr(ADDRMAP7,0x00000f0f); // row16: NULL
-      }
-      else if (size == 0x100000000) {//4GB
+      if (size == 0x100000000) {//4GB
        wr(ADDRMAP0,0x001f0017); // cs_bit0: HIF[29]
-        wr(ADDRMAP6,0x07070707); // row15: HIF[28]
        wr(ADDRMAP7,0x00000f0f); // row16: NULL
      }
      else if (size == 0x200000000) {//8GB
        wr(ADDRMAP0,0x001f0018); // cs_bit0: HIF[30]
-        wr(ADDRMAP6,0x07070707); // row15: HIF[28]
        wr(ADDRMAP7,0x00000f07); // row16: HIF[29]
      }
    }
 	else { // single rank
-      wr(ADDRMAP0,0x001f001f); // cs_bit0: NULL
-      if (size == 0x40000000) {//1GB
-        wr(ADDRMAP6,0x0f070707); // row15: NULL
-        wr(ADDRMAP7,0x00000f0f); // row16: NULL
-      }
-      else if (size == 0x80000000) {//2GB
-        wr(ADDRMAP6,0x07070707); // row15: HIF[28]
-        wr(ADDRMAP7,0x00000f0f); // row16: NULL
-      }
-      else if (size == 0x100000000) {//4GB
-        wr(ADDRMAP6,0x07070707); // row15: HIF[28]
-        wr(ADDRMAP7,0x00000f07); // row16: HIF[29]
-      }
+      if (size == 0x80000000) //2GB
+        wr(ADDRMAP0,0x001f001f); // cs_bit0: NULL
    }
  }
  else if (bits == DDR_BITWIDTH_64) { // phy0+phy1
    if (rank_num == 2) {
-      if (size == 0x100000000) {//4GB
-        wr(ADDRMAP0,0x00040017); // cs_bit0: HIF[29]
-        wr(ADDRMAP6,0x0f080808); // row15: NULL
-        wr(ADDRMAP7,0x00000f0f); // row16: NULL
-      }
-      else if (size == 0x200000000) {//8GB
+      if (size == 0x200000000) {//8GB
        wr(ADDRMAP0,0x00040018); // cs_bit0: HIF[30]
-        wr(ADDRMAP6,0x08080808); // row15: HIF[29]
        wr(ADDRMAP7,0x00000f0f); // row16: NULL
      }
      else if (size == 0x400000000) {//16GB
        wr(ADDRMAP0,0x00040019); // cs_bit0: HIF[31]
-        wr(ADDRMAP6,0x08080808); // row15: HIF[29]
        wr(ADDRMAP7,0x00000f08); // row16: HIF[30]
      }
    }
    else { // single rank
-      wr(ADDRMAP0,0x0004001f); // cs_bit0: NULL
-      if (size == 0x80000000) {//2GB
-        wr(ADDRMAP6,0x0f080808); // row15: NULL
+      if (size == 0x100000000) {//4GB
+        wr(ADDRMAP0,0x0004001f); // cs_bit0: NULL
        wr(ADDRMAP7,0x00000f0f); // row16: NULL
      }
-      else if (size == 0x100000000) {//4GB
-        wr(ADDRMAP6,0x08080808); // row15: HIF[29]
-        wr(ADDRMAP7,0x00000f0f); // row16: NULL
-      }
-      else if (size == 0x200000000) {//8GB
-        wr(ADDRMAP6,0x08080808); // row15: HIF[29]
-        wr(ADDRMAP7,0x00000f08); // row16: HIF[30]
-      }
    }
  }
  else {
--- a/board/thead/light-c910/lpddr4/src/ddr_retention.c
+++ b/board/thead/light-c910/lpddr4/src/ddr_retention.c
@@ -1009,11 +1009,6 @@ int dwc_ddrphy_phyinit_regInterface(regInstr myRegInstr) {

    uint32_t phy_reg_num = ARRAY_SIZE(RetRegList_addr);
    ddr_Regu_Config->phy_reg_num = phy_reg_num;
-#ifdef CONFIG_DDR_DUAL_RANK
-    ddr_Regu_Config->ddr_rank   =  2;
-#else
-    ddr_Regu_Config->ddr_rank   =  1;
-#endif
    Reg_Phy_Addr_Val_t* phy_addr_t = (Reg_Phy_Addr_Val_t*)((char*)ddr_Regu_Config +  64 +  sizeof(Reg_Misc_Addr_Val_t) *  ARRAY_SIZE(MiscRegList));

 #ifdef CONFIG_DDR_MSG
--- a/board/thead/light-c910/sbmeta/sbmeta.c
+++ b/board/thead/light-c910/sbmeta/sbmeta.c
@@ -29,7 +29,7 @@
 #define DMSG(fmt, args...)      trace_printer("", fmt, ##args)
 #endif

-#if CONFIG_IS_ENABLED(LIGHT_SEC_BOOT_WITH_VERIFY_VAL_A) || CONFIG_IS_ENABLED(LIGHT_SEC_BOOT_WITH_VERIFY_VAL_B) || CONFIG_IS_ENABLED(LIGHT_SEC_BOOT_WITH_VERIFY_LPI4A) || CONFIG_IS_ENABLED(LIGHT_SEC_BOOT_WITH_VERIFY_RVBOOK)
+#if CONFIG_IS_ENABLED(LIGHT_SEC_BOOT_WITH_VERIFY_VAL_A) || CONFIG_IS_ENABLED(LIGHT_SEC_BOOT_WITH_VERIFY_VAL_B) || CONFIG_IS_ENABLED(LIGHT_SEC_BOOT_WITH_VERIFY_LPI4A)
 #if CONFIG_IS_ENABLED(LIGHT_SEC_UPGRADE)
 /* digest_size corresponding to digest_scheme specified in sbmeta_info_t */
 static const int digest_size[] = {0, 20, 16, 28, 32, 48, 64, 32};
@@ -62,8 +62,7 @@ typedef struct {
    char        filename[MAX_NAME_SIZE];
    uint8_t     digest[MAX_DIGEST_SIZE];
    uint32_t    relocated_addr;
-    uint8_t     security_level;
-    uint8_t     reserved[15];
+    uint32_t    reserved[4];
 } sbmeta_info_t;

 static int is_sbmeta_info(uint32_t entry_src_addr)
@@ -108,11 +107,6 @@ static int dump_sbmeta_info(sbmeta_info_t *sbmeta_info)
        IMSG("Image has been loaded\r\n");
    }

-    if (sbmeta_info->security_level > SBMETA_SECURITY_LEVEL_SIGN || sbmeta_info->security_level < SBMETA_SECURITY_LEVEL_NONE) {
-        EMSG("security level is invalid\n");
-        return CMD_RET_FAILURE;
-    }
-
    /* dump sbmeta_info_t */
    DMSG("image medium type: %d\n", sbmeta_info->medium_type);
    DMSG("image load part: mmc %d:%d\n", sbmeta_info->dev, sbmeta_info->part);
@@ -142,10 +136,6 @@ static int sbmeta_field_verify(sbmeta_info_t *sbmeta_info, unsigned long img_src
        return CMD_RET_FAILURE;
    }

-    if (sbmeta_info->security_level < SBMETA_SECURITY_LEVEL_SIGN) {
-        return 0;
-    }
-
    /* if image has secure header, check with sbmeta field */
    if (image_have_head(img_src_addr)) {
        phead = (img_header_t *)img_src_addr;
@@ -231,7 +221,7 @@ static int sbmeta_verify_image(uint32_t image_load_addr, sbmeta_info_t *sbmeta_i
    uint8_t checksum_scheme = sbmeta_info->checksum_scheme;
    uint8_t *digest = sbmeta_info->digest;
    uint8_t is_encrypted = sbmeta_info->isencrypted;
-    uint32_t security_level = sbmeta_info->security_level;
+    uint32_t security_level = env_get_hex("sbmeta_security_level", 3);
    uint32_t filesize = 0;
    char buf[64] = {0};

@@ -263,11 +253,11 @@ static int sbmeta_verify_image(uint32_t image_load_addr, sbmeta_info_t *sbmeta_i

    /* start verifying images */
    IMSG("Process %s image verification ...\n", image_name);
-    if (security_level == SBMETA_SECURITY_LEVEL_SIGN || is_encrypted != 0) {
+    if (security_level == 3 || is_encrypted != 0) {
        if (verify_customer_image(image_type, image_load_addr) != 0) {
            return CMD_RET_FAILURE;
        }
-    } else if (security_level == SBMETA_SECURITY_LEVEL_HASH) {
+    } else if (security_level == 2) {
        if (memcmp(digest, buf, 64) == 0) {
            EMSG("sbmeta info doesn't specify digest value in security level 2\r\n");
            return CMD_RET_FAILURE;
@@ -319,8 +309,7 @@ static int light_sbmetaboot(int argc, char *const argv[])
    sbmeta_info_t *sbmeta_info = NULL;

    /* Load sbmeta image to memory */
-    snprintf(cmd, sizeof(cmd), "ext4load mmc ${mmcdev}:${mmcsbmetapart} 0x%x %s", (void *)(uintptr_t)LIGHT_SBMETA_ADDR, SBMETA_FILENAME);
-    printf("%s\n",cmd);
+    snprintf(cmd, sizeof(cmd), "ext4load mmc $mmcdev:%x 0x%p %s", SBMETA_PART, (void *)(uintptr_t)LIGHT_SBMETA_ADDR, SBMETA_FILENAME);
    if (run_command(cmd, 0) != 0) {
        /* if sbmeta doesn't exist, do secboot by default */
        IMSG("SBMETA doesn't exist, go to verify tf/tee\r\n");
@@ -335,6 +324,7 @@ static int light_sbmetaboot(int argc, char *const argv[])

        return 0;
    }
+
    /* initialize crypto algorithm interfaces */
    if (csi_sec_init() != 0) {
        return CMD_RET_FAILURE;
--- a/board/thead/light-c910/sbmeta/sbmeta.h
+++ b/board/thead/light-c910/sbmeta/sbmeta.h
@@ -14,9 +14,10 @@
 #define MAX_DIGEST_SIZE     64
 #define SBMETA_MAGIC        0x544D4253  /* = {'S', 'B', 'M', 'T'} */

-#if CONFIG_IS_ENABLED(LIGHT_SEC_BOOT_WITH_VERIFY_VAL_A) || CONFIG_IS_ENABLED(LIGHT_SEC_BOOT_WITH_VERIFY_VAL_B) || CONFIG_IS_ENABLED(LIGHT_SEC_BOOT_WITH_VERIFY_LPI4A) || CONFIG_IS_ENABLED(LIGHT_SEC_BOOT_WITH_VERIFY_RVBOOK)
+#if CONFIG_IS_ENABLED(LIGHT_SEC_BOOT_WITH_VERIFY_VAL_A) || CONFIG_IS_ENABLED(LIGHT_SEC_BOOT_WITH_VERIFY_VAL_B) || CONFIG_IS_ENABLED(LIGHT_SEC_BOOT_WITH_VERIFY_LPI4A)
 #define LIGHT_SBMETA_ADDR   0x10000000
 #endif
+#define SBMETA_PART         5
 #define ENTRY_SIZE          128
 #define PLAIN_SBMETA_TEXT   4096
 #define SBMETA_SIZE         4736  /* 4K SMBETA image + 640 footer */
@@ -26,8 +27,8 @@
 #define SIGN_TYPE_NUM       6
 #define SBMETA_FILENAME     "sbmeta.bin"

-#define SBMETA_SECURITY_LEVEL_SIGN      3   /* verify signature and hash */
-#define SBMETA_SECURITY_LEVEL_HASH      2   /* verify checksum */
-#define SBMETA_SECURITY_LEVEL_NONE      1   /* no verification */
+#define SBMETA_SECURITY_LEVEL_H      3   /* verify signature and hash */
+#define SBMETA_SECURITY_LEVEL_M      2   /* verify checksum */
+#define SBMETA_SECURITY_LEVEL_L      1   /* no verification */

 #endif
--- a/board/thead/light-c910/sec_check.c
+++ b/board/thead/light-c910/sec_check.c
@@ -75,7 +75,7 @@ void designware_get_mac_from_fuse(unsigned char *mac)
 	}
 }

-#if CONFIG_IS_ENABLED(LIGHT_SEC_BOOT_WITH_VERIFY_VAL_A) || CONFIG_IS_ENABLED(LIGHT_SEC_BOOT_WITH_VERIFY_VAL_B) || CONFIG_IS_ENABLED(LIGHT_SEC_BOOT_WITH_VERIFY_ANT_REF) || CONFIG_IS_ENABLED(LIGHT_SEC_BOOT_WITH_VERIFY_LPI4A) || CONFIG_IS_ENABLED(LIGHT_SEC_BOOT_WITH_VERIFY_RVBOOK)
+#if CONFIG_IS_ENABLED(LIGHT_SEC_BOOT_WITH_VERIFY_VAL_A) || CONFIG_IS_ENABLED(LIGHT_SEC_BOOT_WITH_VERIFY_VAL_B) || CONFIG_IS_ENABLED(LIGHT_SEC_BOOT_WITH_VERIFY_ANT_REF) || CONFIG_IS_ENABLED(LIGHT_SEC_BOOT_WITH_VERIFY_LPI4A)
 /* Secure function for image verificaiton here */
 int get_image_version(unsigned long img_src_addr)
 {
--- a/board/thead/light-c910/spl.c
+++ b/board/thead/light-c910/spl.c
@@ -420,14 +420,14 @@ void cpu_performance_enable(void)
 #define CSR_MHINT2_E	0x7cc
 #define CSR_MHINT4	0x7ce
 	csr_write(CSR_SMPEN, 0x1);
-	csr_write(CSR_MCCR2, 0xe2490009);
-	csr_write(CSR_MXSTATUS, 0x638000);
-	csr_write(CSR_MHINT, 0x6e30c | (1<<21) | (1<<22)); // set bit21 & bit 22 to close tlb & fence broadcast
-	// FIXME: Clear bit[12] to disable L0BTB.
-	csr_write(CSR_MHCR, 0x17f); // clear bit7 to disable indirect brantch prediction
 	// FIXME set mhint2[22] to enable core icg en
 	csr_write(CSR_MHINT2_E, csr_read(CSR_MHINT2_E) | 0x420000);
 	csr_write(CSR_MHINT4, csr_read(CSR_MHINT4) | 0x410);
+	csr_write(CSR_MCCR2, 0xe2490009);
+	// FIXME: Clear bit[12] to disable L0BTB.
+	csr_write(CSR_MHCR, 0x17f); // clear bit7 to disable indirect brantch prediction
+	csr_write(CSR_MHINT, 0x6e30c | (1<<21) | (1<<22)); // set bit21 & bit 22 to close tlb & fence broadcast
+	mdelay(50); // workaround
 }

 static int bl1_img_have_head(unsigned long img_src_addr)
@@ -508,11 +508,7 @@ void board_init_f(ulong dummy)
 	}
 #endif
 	ddr_clk_config(0);
-#ifdef CONFIG_RV_BOOK
-	cpu_clk_config(750000000);
-#else
 	cpu_clk_config(0);
-#endif

 	init_ddr();
 	setup_ddr_scramble();
--- a/board/thead/light-c910/sys_clk.c
+++ b/board/thead/light-c910/sys_clk.c
@@ -20,106 +20,12 @@
 #define LIGHT_APSYS_RSTGEN_ADDRBASE	0xffff015000
 #define LIGHT_DPU_CLOCK_GATING_CTRL0	0xffef601A28
 #define LIGHT_DPU_CLOCK_GATING_CTRL1    0xffef601A2C
-#ifdef CONFIG_RV_BOOK
-#define LIGHT_CPU_PLL_IDX(x)            (x)
-#endif

 void show_sys_clk(void)
 {
 	/* Do nothing for FPGA */
 }

-#ifdef CONFIG_RV_BOOK
-
-static int _light_get_pllid(void)
-{
-	unsigned int val;
-	int ret;
-	val = readl((void *)LIGHT_APCLK_ADDRBASE + 0x100);
-	if(val & 0x1)
-		ret = LIGHT_CPU_PLL_IDX(1);
-	else
-		ret = LIGHT_CPU_PLL_IDX(0);
-	return ret;
-}
-
-void update_cpu_freq(uint32_t val)
-{
-	if(_light_get_pllid() == LIGHT_CPU_PLL_IDX(0))
-	{
-        /* update cpupll1*/
-		writel(0x20000000, (void *)LIGHT_APCLK_ADDRBASE + 0x14);
-		writel(val, (void *)LIGHT_APCLK_ADDRBASE + 0x10);
-		writel(0x23000000, (void *)LIGHT_APCLK_ADDRBASE + 0x14);
-		udelay(3);
-		writel(0x03000000, (void *)LIGHT_APCLK_ADDRBASE + 0x14);
-		readl((void *)LIGHT_APCLK_ADDRBASE + 0x80);
-		readl((void *)LIGHT_APCLK_ADDRBASE + 0x80);
-		while(!(readl((void *)LIGHT_APCLK_ADDRBASE + 0x80) & 0x10));
-		udelay(11);
-	}else{
-        /* update cpupll0*/
-		writel(0x20000000, (void *)LIGHT_APCLK_ADDRBASE + 0x04);
-		writel(val, (void *)LIGHT_APCLK_ADDRBASE + 0x00);
-		writel(0x23000000, (void *)LIGHT_APCLK_ADDRBASE + 0x04);
-		udelay(3);
-		writel(0x03000000, (void *)LIGHT_APCLK_ADDRBASE + 0x04);
-		readl((void *)LIGHT_APCLK_ADDRBASE + 0x80);
-		readl((void *)LIGHT_APCLK_ADDRBASE + 0x80);
-		while(!(readl((void *)LIGHT_APCLK_ADDRBASE + 0x80) & 0x02));
-		udelay(11);
-    }
-}
-
-void cpu_clk_config(int32_t cpu_freq)
-{
-#ifndef CONFIG_TARGET_LIGHT_FPGA_FM_C910 /* for sillicon */
-       unsigned int tmp;
-
-    switch(cpu_freq){
-        case 750000000:
-            {
-               /* 4. update c910_cclk to 750Mhz */
-            update_cpu_freq(0x1407d01);
-               /* config bus: cpu clk ratio to 1:1 */
-               writel((readl((const volatile void __iomem *)(LIGHT_APCLK_ADDRBASE + 0x100)) & (~(0x7<<8))) | (0x0<<8), (void *)(LIGHT_APCLK_ADDRBASE + 0x100)); // ratio=0
-               writel(readl((const volatile void __iomem *)(LIGHT_APCLK_ADDRBASE + 0x100)) & (~(0x1<<11)), (void *)(LIGHT_APCLK_ADDRBASE + 0x100)); // sync=0
-               writel(readl((const volatile void __iomem *)(LIGHT_APCLK_ADDRBASE + 0x100)) | (0x1<<11), (void *)(LIGHT_APCLK_ADDRBASE + 0x100)); // sync=1
-            printf("cpu frequency to 750\n");
-        }
-        break;
-        case 1500000000:
-            {
-               /* 4. update c910_cclk to 1.5Ghz */
-            update_cpu_freq(0x01207d01);
-               /* config bus: cpu clk ratio to 1:2 */
-               writel((readl((const volatile void __iomem *)(LIGHT_APCLK_ADDRBASE + 0x100)) & (~(0x7<<8))) | (0x1<<8), (void *)(LIGHT_APCLK_ADDRBASE + 0x100)); // ratio=0
-               writel(readl((const volatile void __iomem *)(LIGHT_APCLK_ADDRBASE + 0x100)) & (~(0x1<<11)), (void *)(LIGHT_APCLK_ADDRBASE + 0x100)); // sync=0
-               writel(readl((const volatile void __iomem *)(LIGHT_APCLK_ADDRBASE + 0x100)) | (0x1<<11), (void *)(LIGHT_APCLK_ADDRBASE + 0x100)); // sync=1
-            printf("cpu frequency to 1500\n");
-            }
-        break;
-        default:
-            return;
-    }
-        if(_light_get_pllid() == LIGHT_CPU_PLL_IDX(0))
-        {
-               /* switch c910_cclk to cpu_pll1_foutpostdiv */
-               tmp = readl((void *)LIGHT_APCLK_ADDRBASE + 0x100);
-               tmp |= 0x1;
-               writel(tmp, (void *)LIGHT_APCLK_ADDRBASE + 0x100);
-        }else
-        {
-               /* switch c910_cclk to cpu_pll0_foutpostdiv */
-               tmp = readl((void *)LIGHT_APCLK_ADDRBASE + 0x100);
-               tmp &= ~0x1;
-               writel(tmp, (void *)LIGHT_APCLK_ADDRBASE + 0x100);
-        }
-       udelay(1);
-#endif
-}
-
-#else
 void cpu_clk_config(uint32_t cpu_freq)
 {
 #ifndef CONFIG_TARGET_LIGHT_FPGA_FM_C910 /* for sillicon */
@@ -148,7 +54,6 @@ void cpu_clk_config(uint32_t cpu_freq)
 	udelay(1);
 #endif
 }
-#endif

 void sys_clk_config(void)
 {
@@ -431,24 +336,6 @@ void sys_clk_config(void)
 #endif
 }

-#ifndef CONFIG_SPL_BUILD
-static int cpu_switch_freq(cmd_tbl_t *cmdtp, int flag, int argc,
-                      char * const argv[])
-{
-    cpu_clk_config(1500000000);
-    return 0;
-}
-
-U_BOOT_CMD(
-        cpufreq_switch,
-        2,
-        0,
-        cpu_switch_freq,
-        "switch cpu freq to highest",
-        ""
-);
-#endif
-
 void ddr_clk_config(int ddr_freq)
 {
 	/* Do nothing for FPGA */
--- a/cmd/Kconfig
+++ b/cmd/Kconfig
@@ -375,6 +375,18 @@ config CMD_FDT
 	help
 	  Do FDT related setup before booting into the Operating System.

+config SUPPORT_EXTENSION_SCAN
+	bool
+
+config CMD_EXTENSION
+	bool "Extension board management command"
+	select CMD_FDT
+	depends on SUPPORT_EXTENSION_SCAN
+	help
+	  Enables the "extension" command, which allows to detect
+	  extension boards connected to the system, and apply
+	  corresponding Device Tree overlays.
+
 config CMD_GO
 	bool "go"
 	default y
--- a/cmd/Makefile
+++ b/cmd/Makefile
@@ -48,6 +48,7 @@ ifdef CONFIG_POST
 obj-$(CONFIG_CMD_DIAG) += diag.o
 endif
 obj-$(CONFIG_CMD_DTIMG) += dtimg.o
+obj-$(CONFIG_CMD_EXTENSION) += extension_board.o
 obj-$(CONFIG_CMD_ECHO) += echo.o
 obj-$(CONFIG_ENV_IS_IN_EEPROM) += eeprom.o
 obj-$(CONFIG_CMD_EEPROM) += eeprom.o
@@ -137,7 +138,6 @@ obj-$(CONFIG_CMD_TPM) += tpm-common.o
 obj-$(CONFIG_CMD_TPM_V1) += tpm-v1.o
 obj-$(CONFIG_CMD_TPM_TEST) += tpm_test.o
 obj-$(CONFIG_CMD_TPM_V2) += tpm-v2.o
-obj-$(CONFIG_CMD_MEASURED_BOOT) += mboot.o
 obj-$(CONFIG_CMD_CROS_EC) += cros_ec.o
 obj-$(CONFIG_CMD_TSI148) += tsi148.o
 obj-$(CONFIG_CMD_UBI) += ubi.o
--- a/cmd/bootandroid.c
+++ b/cmd/bootandroid.c
@@ -237,15 +237,9 @@ static int prepare_data_from_vendor_boot(struct andr_img_hdr *hdr, int dtb_start
 			if (ramdisk_entry->ramdisk_type != VENDOR_RAMDISK_TYPE_RECOVERY) {
 				continue;
 			}
-			printf("find recovery from ramdisk table.\n");
+			printf("find recovery from ramdisk table.");
 			int ramdisk_start = env_get_hex(ENV_RAMDISK_ADDR, DEFAULT_RAMDISK_ADDR);
 			int recovery_ramdisk_offset = vendor_boot_pagesize * o + ramdisk_entry->ramdisk_offset;
-
-			printf("ramdisk_start:%x, ramdisk_size:%x, dtb_start:%x\n", ramdisk_start, ramdisk_entry->ramdisk_size, dtb_start);
-			if (ramdisk_start + ramdisk_entry->ramdisk_size > dtb_start) {
-				printf("ramdisk space are overlaped !!!\n");
-			}
-
 			memcpy((void *)(uint64_t)ramdisk_start, vendor_boot_data + recovery_ramdisk_offset,
 													 ramdisk_entry->ramdisk_size);//ramdisk
 			//get bootconfig form vendor_boot.img and append bootconfig to ramdisk
@@ -298,10 +292,10 @@ static void prepare_loaded_parttion_data(const uint8_t* data, bool isRecovery)
 		printf("Boot image kernel_start:%x, kernel_offset:%x, kernel_size:%d\n", kernel_start, kernel_offset, hdr->kernel_size);
 		printf("Boot image ramdisk_start:%x, ramdisk_offset:%x, ramdisk_size:%d\n", ramdisk_start, ramdisk_offset, hdr->ramdisk_size);
 		printf("Boot image page_size:%d\n", hdr->page_size);
-		printf("dtb_start:%x, dtb_offset:%x, dtb_size:%d\n", dtb_start, dtb_offset, hdr->dtb_size);
+		printf("dtb_offset:%x, dtb_size:%d\n", dtb_offset, hdr->dtb_size);

-		if (kernel_start + hdr->kernel_size > ramdisk_start || kernel_start + hdr->kernel_size > dtb_start || ramdisk_start + hdr->ramdisk_size > dtb_start) {
-			printf("boot.img kernel space and ramdisk space are overlaped !!!\n");
+ 		if (kernel_start + hdr->kernel_size > ramdisk_start || kernel_start + hdr->kernel_size > dtb_start) {
+			printf("boot.img kernel space and ramdis space are overlaped !!!\n");
 		} else {
 			memcpy((void *)(uint64_t)kernel_start, data + kernel_offset, hdr->kernel_size);
 			if (!isRecovery) {
--- a/cmd/booti.c
+++ b/cmd/booti.c
@@ -118,7 +118,7 @@ U_BOOT_CMD(

 #endif

-#if CONFIG_IS_ENABLED(LIGHT_SEC_BOOT_WITH_VERIFY_VAL_A) || CONFIG_IS_ENABLED(LIGHT_SEC_BOOT_WITH_VERIFY_VAL_B) || CONFIG_IS_ENABLED(LIGHT_SEC_BOOT_WITH_VERIFY_ANT_REF) || CONFIG_IS_ENABLED(LIGHT_SEC_BOOT_WITH_VERIFY_LPI4A) || CONFIG_IS_ENABLED(LIGHT_SEC_BOOT_WITH_VERIFY_RVBOOK)
+#if CONFIG_IS_ENABLED(LIGHT_SEC_BOOT_WITH_VERIFY_VAL_A) || CONFIG_IS_ENABLED(LIGHT_SEC_BOOT_WITH_VERIFY_VAL_B) || CONFIG_IS_ENABLED(LIGHT_SEC_BOOT_WITH_VERIFY_ANT_REF) || CONFIG_IS_ENABLED(LIGHT_SEC_BOOT_WITH_VERIFY_LPI4A)
 #if CONFIG_IS_ENABLED(LIGHT_SEC_UPGRADE)
 extern int light_secboot(int argc, char * const argv[]);
 #endif
@@ -137,91 +137,6 @@ U_BOOT_CMD(
 	"vimage addr imgname[[tee/tf]	- verify specifed image resides in addr\n"
 );

-/* check whether partition numbers are consistent with the slot suffix */
-static int do_light_bootab(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) {
-	char *slot_suffix = env_get("slot_suffix");
-	int teepart = env_get_hex("mmcteepart", 3);
-
-	struct disk_partition part_info;
-	struct blk_desc *dev_desc;
-	int part = 0;
-
-        dev_desc = blk_get_dev("mmc", CONFIG_FASTBOOT_FLASH_MMC_DEV);
-	if (dev_desc == NULL) {
-		printf("Failed to find MMC device\n");
-		return 1;
-	}
-
-	if ((strcmp(slot_suffix, "a") == 0) && (teepart != 3)) {
-		part = part_get_info_by_name(dev_desc, "boot_a", &part_info);
-		if (part < 0) {
-			printf("Failed to find MMC device\n");
-			return 1;
-		}
-		env_set_hex("mmcbootpart", part);
-
-		part = part_get_info_by_name(dev_desc, "tee_a", &part_info);
-		if (part < 0) {
-			printf("Failed to find MMC device\n");
-			return 1;
-		}
-		env_set_hex("mmcteepart", part);
-
-		part = part_get_info_by_name(dev_desc, "sbmeta_a", &part_info);
-		if (part < 0) {
-			printf("Failed to find MMC device\n");
-			return 1;
-		}
-		env_set_hex("mmcsbmetapart", part);
-
-		part = part_get_info_by_name(dev_desc, "root_a", &part_info);
-		if (part < 0) {
-			printf("root AB partition is not enabled\n");
-		} else {
-			env_set_hex("mmcpart", part);
-		}
-
-		run_command("env save", 0);
-	} else if ((strcmp(slot_suffix, "b") == 0) && (teepart != 10)) {
-		part = part_get_info_by_name(dev_desc, "boot_b", &part_info);
-		if (part < 0) {
-			printf("Failed to find MMC device\n");
-			return 1;
-		}
-		env_set_hex("mmcbootpart", part);
-
-		part = part_get_info_by_name(dev_desc, "tee_b", &part_info);
-		if (part < 0) {
-			printf("Failed to find MMC device\n");
-			return 1;
-		}
-		env_set_hex("mmcteepart", part);
-
-		part = part_get_info_by_name(dev_desc, "sbmeta_b", &part_info);
-		if (part < 0) {
-			printf("Failed to find MMC device\n");
-			return 1;
-		}
-		env_set_hex("mmcsbmetapart", part);
-
-		part = part_get_info_by_name(dev_desc, "root_b", &part_info);
-		if (part < 0) {
-			printf("root AB partition is not enabled\n");
-		} else {
-			env_set_hex("mmcpart", part);
-		}
-		run_command("env save", 0);
-	}
-	printf("current active slot is:%s\n", slot_suffix);
-	return CMD_RET_SUCCESS;
-}
-
-U_BOOT_CMD(
-	light_bootab, CONFIG_SYS_MAXARGS, 1, do_light_bootab,
-	"Light A/B updates",
-	NULL
-);
-
 #endif

 #endif
--- a/cmd/extension_board.c
+++ b/cmd/extension_board.c
@@ -0,0 +1,167 @@
+// SPDX-License-Identifier: GPL-2.0+
+/*
+ * (C) Copyright 2021
+ * Köry Maincent, Bootlin, <kory.maincent@bootlin.com>
+ */
+
+#include <common.h>
+#include <command.h>
+#include <malloc.h>
+#include <extension_board.h>
+#include <mapmem.h>
+#include <linux/libfdt.h>
+#include <fdt_support.h>
+
+static LIST_HEAD(extension_list);
+
+static int extension_apply(struct extension *extension)
+{
+	char *overlay_cmd;
+	ulong extrasize, overlay_addr;
+	struct fdt_header *blob;
+
+	if (!working_fdt) {
+		printf("No FDT memory address configured. Please configure\n"
+		       "the FDT address via \"fdt addr <address>\" command.\n");
+		return CMD_RET_FAILURE;
+	}
+
+	overlay_cmd = env_get("extension_overlay_cmd");
+	if (!overlay_cmd) {
+		printf("Environment extension_overlay_cmd is missing\n");
+		return CMD_RET_FAILURE;
+	}
+
+	overlay_addr = env_get_hex("extension_overlay_addr", 0);
+	if (!overlay_addr) {
+		printf("Environment extension_overlay_addr is missing\n");
+		return CMD_RET_FAILURE;
+	}
+
+	env_set("extension_overlay_name", extension->overlay);
+	if (run_command(overlay_cmd, 0) != 0)
+		return CMD_RET_FAILURE;
+
+	extrasize = env_get_hex("filesize", 0);
+	if (!extrasize)
+		return CMD_RET_FAILURE;
+
+	fdt_shrink_to_minimum(working_fdt, extrasize);
+
+	blob = map_sysmem(overlay_addr, 0);
+	if (!fdt_valid(&blob))
+		return CMD_RET_FAILURE;
+
+	/* apply method prints messages on error */
+	if (fdt_overlay_apply_verbose(working_fdt, blob))
+		return CMD_RET_FAILURE;
+
+	return CMD_RET_SUCCESS;
+}
+
+static int do_extension_list(struct cmd_tbl *cmdtp, int flag,
+			     int argc, char *const argv[])
+{
+	int i = 0;
+	struct extension *extension;
+
+	if (list_empty(&extension_list)) {
+		printf("No extension registered - Please run \"extension scan\"\n");
+		return CMD_RET_SUCCESS;
+	}
+
+	list_for_each_entry(extension, &extension_list, list) {
+		printf("Extension %d: %s\n", i++, extension->name);
+		printf("\tManufacturer: \t\t%s\n", extension->owner);
+		printf("\tVersion: \t\t%s\n", extension->version);
+		printf("\tDevicetree overlay: \t%s\n", extension->overlay);
+		printf("\tOther information: \t%s\n", extension->other);
+	}
+	return CMD_RET_SUCCESS;
+}
+
+static int do_extension_scan(struct cmd_tbl *cmdtp, int flag,
+			     int argc, char *const argv[])
+{
+	struct extension *extension, *next;
+	int extension_num;
+
+	list_for_each_entry_safe(extension, next, &extension_list, list) {
+		list_del(&extension->list);
+		free(extension);
+	}
+	extension_num = extension_board_scan(&extension_list);
+
+	if (extension_num < 0)
+		return CMD_RET_FAILURE;
+
+	printf("Found %d extension board(s).\n", extension_num);
+
+	return CMD_RET_SUCCESS;
+}
+
+static int do_extension_apply(struct cmd_tbl *cmdtp, int flag,
+			      int argc, char *const argv[])
+{
+	struct extension *extension = NULL;
+	struct list_head *entry;
+	int i = 0, extension_id, ret;
+
+	if (argc < 2)
+		return CMD_RET_USAGE;
+
+	if (strcmp(argv[1], "all") == 0) {
+		list_for_each_entry(extension, &extension_list, list) {
+			ret = extension_apply(extension);
+			if (ret != CMD_RET_SUCCESS)
+				break;
+		}
+	} else {
+		extension_id = simple_strtol(argv[1], NULL, 10);
+		list_for_each(entry, &extension_list) {
+			if (i == extension_id) {
+				extension = list_entry(entry, struct extension,  list);
+				break;
+			}
+			i++;
+		}
+
+		if (!extension) {
+			printf("Wrong extension number\n");
+			return CMD_RET_FAILURE;
+		}
+
+		ret = extension_apply(extension);
+	}
+
+	return ret;
+}
+
+static struct cmd_tbl cmd_extension[] = {
+	U_BOOT_CMD_MKENT(scan, 1, 1, do_extension_scan, "", ""),
+	U_BOOT_CMD_MKENT(list, 1, 0, do_extension_list, "", ""),
+	U_BOOT_CMD_MKENT(apply, 2, 0, do_extension_apply, "", ""),
+};
+
+static int do_extensionops(struct cmd_tbl *cmdtp, int flag, int argc,
+			   char *const argv[])
+{
+	struct cmd_tbl *cp;
+
+	/* Drop the extension command */
+	argc--;
+	argv++;
+
+	cp = find_cmd_tbl(argv[0], cmd_extension, ARRAY_SIZE(cmd_extension));
+	if (cp)
+		return cp->cmd(cmdtp, flag, argc, argv);
+
+	return CMD_RET_USAGE;
+}
+
+U_BOOT_CMD(extension, 3, 1, do_extensionops,
+	"Extension board management sub system",
+	"scan - scan plugged extension(s) board(s)\n"
+	"extension list - lists available extension(s) board(s)\n"
+	"extension apply <extension number|all> - applies DT overlays corresponding to extension boards\n"
+);
--- a/cmd/fdt.c
+++ b/cmd/fdt.c
@@ -27,7 +27,6 @@
 */
 DECLARE_GLOBAL_DATA_PTR;

-static int fdt_valid(struct fdt_header **blobp);
 static int fdt_parse_prop(char *const*newval, int count, char *data, int *len);
 static int fdt_print(const char *pathp, char *prop, int depth);
 static int is_printable_string(const void *data, int len);
@@ -732,54 +731,6 @@ static int do_fdt(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])

 /****************************************************************************/

-/**
- * fdt_valid() - Check if an FDT is valid. If not, change it to NULL
- *
- * @blobp: Pointer to FDT pointer
- * @return 1 if OK, 0 if bad (in which case *blobp is set to NULL)
- */
-static int fdt_valid(struct fdt_header **blobp)
-{
-	const void *blob = *blobp;
-	int err;
-
-	if (blob == NULL) {
-		printf ("The address of the fdt is invalid (NULL).\n");
-		return 0;
-	}
-
-	err = fdt_check_header(blob);
-	if (err == 0)
-		return 1;	/* valid */
-
-	if (err < 0) {
-		printf("libfdt fdt_check_header(): %s", fdt_strerror(err));
-		/*
-		 * Be more informative on bad version.
-		 */
-		if (err == -FDT_ERR_BADVERSION) {
-			if (fdt_version(blob) <
-			    FDT_FIRST_SUPPORTED_VERSION) {
-				printf (" - too old, fdt %d < %d",
-					fdt_version(blob),
-					FDT_FIRST_SUPPORTED_VERSION);
-			}
-			if (fdt_last_comp_version(blob) >
-			    FDT_LAST_SUPPORTED_VERSION) {
-				printf (" - too new, fdt %d > %d",
-					fdt_version(blob),
-					FDT_LAST_SUPPORTED_VERSION);
-			}
-		}
-		printf("\n");
-		*blobp = NULL;
-		return 0;
-	}
-	return 1;
-}
-
-/****************************************************************************/
-
 /*
 * Parse the user's input, partially heuristic.  Valid formats:
 * <0x00112233 4 05>	- an array of cells.  Numbers follow standard
--- a/cmd/mboot.c
+++ b/cmd/mboot.c
@@ -1,122 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0+
-/*
- * Copyright (c) 2018 Bootlin
- * Author: Miquel Raynal <miquel.raynal@bootlin.com>
- */
-
-#include <common.h>
-#include <dm.h>
-#include <log.h>
-#include <mapmem.h>
-#include <tpm-common.h>
-#include <tpm-v2.h>
-#include <env.h>
-#include <env_internal.h>
-#include "tpm-user-utils.h"
-#include "sec_library.h"
-
-enum mboot_type {
-	UBOOT_IMAGE = 0,
-	KERNEL_IMAGE,
-	PARTITIONS_STR,
-	MBOOT_TYPE_MAX,
-};
-enum pcr_index {
-	PCR_0 = 0,
-	PCR_1,
-	PCR_2,
-	PCR_3,
-	PCR_4,
-	PCR_5,
-	PCR_6,
-	PCR_7,
-};
-static uint8_t image_digest[32] __attribute__((aligned(64))) = { 0 };
-
-#define CHECK_RET_WITH_RET(x, ret)                                                                 \
-    do {                                                                                           \
-        if (!(x)) {                                                                                \
-            return ret;                                                                            \
-        }                                                                                          \
-    } while (0)
-
-static uint32_t hash_image_sha256(long image_addr, size_t size, void *digest, uint32_t *digest_len)
-{
-	uint32_t ret;
-	sc_sha_t sha;
-	sc_sha_context_t ctx;
-
-	CHECK_RET_WITH_RET(ret = csi_sec_library_init(), ret);
-	CHECK_RET_WITH_RET(ret = sc_sha_init(&sha, 0), ret);
-	CHECK_RET_WITH_RET(ret = sc_sha_start(&sha, &ctx, SC_SHA_MODE_256), ret);
-	CHECK_RET_WITH_RET(ret = sc_sha_trans_config(&sha, &ctx, SC_SHA_DMA_MODE), ret);
-	CHECK_RET_WITH_RET(ret = sc_sha_update(&sha, &ctx, (void *)image_addr, size), ret);
-	CHECK_RET_WITH_RET(ret = sc_sha_finish(&sha, &ctx, digest, digest_len), ret);
-
-	return SC_OK;
-}
-
-static int do_measured_boot(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
-{
-	struct udevice *dev;
-	struct tpm_chip_priv *priv;
-	uint32_t index, type;
-	uint32_t rc;
-	int ret;
-	long image_addr = 0;
-	size_t image_size = 0;
-	uint32_t image_digest_len = 0;
-	char *partitions_str = NULL;
-
-	if (argc != 1)
-		return CMD_RET_USAGE;
-
-	ret = get_tpm(&dev);
-	if (ret)
-		return ret;
-
-	tpm_init(dev); /* Initialization TPM2 chip */
-	rc = tpm2_startup(dev, TPM2_SU_CLEAR); /* Startup TPM2 chip with mode TPM_ST_CLEAR*/
-	if (rc)
-		report_return_code(rc);
-
-	priv = dev_get_uclass_priv(dev);
-	if (!priv)
-		return -EINVAL;
-
-	for (type = UBOOT_IMAGE; type < MBOOT_TYPE_MAX; type++) {
-		if (type == UBOOT_IMAGE) { /*U-BOOT Image */
-			index = PCR_0;
-			image_addr = CONFIG_SPL_TEXT_BASE;
-			image_size = CONFIG_SPL_MAX_SIZE+CONFIG_SYS_MONITOR_LEN;
-		} else if (type == KERNEL_IMAGE) { /* KERNEL Image */
-			index = PCR_0;
-			image_addr = 0x00200000;
-			if (fs_set_blk_dev("mmc", "0:2", 2))
-				return -EINVAL;
-			if (fs_size("Image", &image_size) < 0)
-				return -EINVAL;
-		} else if (type == PARTITIONS_STR) { /* PARTITIONS */
-			index = PCR_5;
-			partitions_str = env_get("partitions");
-			image_addr = (long)partitions_str;
-			image_size = strlen(partitions_str);
-		}
-
-		rc = hash_image_sha256(image_addr, image_size, image_digest, &image_digest_len);
-		if (rc)
-			return -EINVAL;
-
-		rc = tpm2_pcr_extend(dev, index, image_digest);
-		if (rc)
-			break;
-	}
-
-	return report_return_code(rc);
-}
-
-U_BOOT_CMD(
-	measured_boot, CONFIG_SYS_MAXARGS, 1, do_measured_boot,
-	"extend hash(u-boot), hash(kernel), hash(partitions str) to pcr0 and pcr5",
-	""
-);
--- a/cmd/pxe_utils.c
+++ b/cmd/pxe_utils.c
@@ -9,6 +9,8 @@
 #include <malloc.h>
 #include <mapmem.h>
 #include <lcd.h>
+#include <fdt_support.h>
+#include <linux/libfdt.h>
 #include <linux/string.h>
 #include <linux/ctype.h>
 #include <errno.h>
@@ -279,6 +281,9 @@ static void label_destroy(struct pxe_label *label)
 	if (label->fdtdir)
 		free(label->fdtdir);

+	if (label->fdtoverlays)
+		free(label->fdtoverlays);
+
 	free(label);
 }

@@ -326,6 +331,92 @@ static int label_localboot(struct pxe_label *label)
 	return run_command_list(localcmd, strlen(localcmd), 0);
 }

+/*
+ * Loads fdt overlays specified in 'fdtoverlays'.
+ */
+#ifdef CONFIG_OF_LIBFDT_OVERLAY
+static void label_boot_fdtoverlay(struct cmd_tbl *cmdtp, struct pxe_label *label)
+{
+	char *fdtoverlay = label->fdtoverlays;
+	struct fdt_header *working_fdt;
+	char *fdtoverlay_addr_env;
+	ulong fdtoverlay_addr;
+	ulong fdt_addr;
+	int err;
+
+	/* Get the main fdt and map it */
+	fdt_addr = simple_strtoul(env_get("fdt_addr_r"), NULL, 16);
+	working_fdt = map_sysmem(fdt_addr, 0);
+	err = fdt_check_header(working_fdt);
+	if (err)
+		return;
+
+	/* Get the specific overlay loading address */
+	fdtoverlay_addr_env = env_get("fdtoverlay_addr_r");
+	if (!fdtoverlay_addr_env) {
+		printf("Invalid fdtoverlay_addr_r for loading overlays\n");
+		return;
+	}
+
+	fdtoverlay_addr = simple_strtoul(fdtoverlay_addr_env, NULL, 16);
+
+	/* Cycle over the overlay files and apply them in order */
+	do {
+		struct fdt_header *blob;
+		char *overlayfile;
+		char *end;
+		int len;
+
+		/* Drop leading spaces */
+		while (*fdtoverlay == ' ')
+			++fdtoverlay;
+
+		/* Copy a single filename if multiple provided */
+		end = strstr(fdtoverlay, " ");
+		if (end) {
+			len = (int)(end - fdtoverlay);
+			overlayfile = malloc(len + 1);
+			strncpy(overlayfile, fdtoverlay, len);
+			overlayfile[len] = '\0';
+		} else
+			overlayfile = fdtoverlay;
+
+		if (!strlen(overlayfile))
+			goto skip_overlay;
+
+		/* Load overlay file */
+		err = get_relfile_envaddr(cmdtp, overlayfile,
+					  "fdtoverlay_addr_r");
+		if (err < 0) {
+			printf("Failed loading overlay %s\n", overlayfile);
+			goto skip_overlay;
+		}
+
+		/* Resize main fdt */
+		fdt_shrink_to_minimum(working_fdt, 8192);
+
+		blob = map_sysmem(fdtoverlay_addr, 0);
+		err = fdt_check_header(blob);
+		if (err) {
+			printf("Invalid overlay %s, skipping\n",
+			       overlayfile);
+			goto skip_overlay;
+		}
+
+		err = fdt_overlay_apply_verbose(working_fdt, blob);
+		if (err) {
+			printf("Failed to apply overlay %s, skipping\n",
+			       overlayfile);
+			goto skip_overlay;
+		}
+
+skip_overlay:
+		if (end)
+			free(overlayfile);
+	} while ((fdtoverlay = strstr(fdtoverlay, " ")));
+}
+#endif
+
 /*
 * Boot according to the contents of a pxe_label.
 *
@@ -520,6 +611,11 @@ static int label_boot(cmd_tbl_t *cmdtp, struct pxe_label *label)
 				       label->name);
 				goto cleanup;
 			}
+
+#ifdef CONFIG_OF_LIBFDT_OVERLAY
+			if (label->fdtoverlays)
+				label_boot_fdtoverlay(cmdtp, label);
+#endif
 		} else {
 			bootm_argv[3] = NULL;
 		}
@@ -577,6 +673,7 @@ enum token_type {
 	T_INCLUDE,
 	T_FDT,
 	T_FDTDIR,
+	T_FDTOVERLAYS,
 	T_ONTIMEOUT,
 	T_IPAPPEND,
 	T_BACKGROUND,
@@ -611,6 +708,7 @@ static const struct token keywords[] = {
 	{"fdt", T_FDT},
 	{"devicetreedir", T_FDTDIR},
 	{"fdtdir", T_FDTDIR},
+	{"fdtoverlays", T_FDTOVERLAYS},
 	{"ontimeout", T_ONTIMEOUT,},
 	{"ipappend", T_IPAPPEND,},
 	{"background", T_BACKGROUND,},
@@ -1043,6 +1141,11 @@ static int parse_label(char **c, struct pxe_menu *cfg)
 				err = parse_sliteral(c, &label->fdtdir);
 			break;

+		case T_FDTOVERLAYS:
+			if (!label->fdtoverlays)
+				err = parse_sliteral(c, &label->fdtoverlays);
+			break;
+
 		case T_LOCALBOOT:
 			label->localboot = 1;
 			err = parse_integer(c, &label->localboot_val);
--- a/cmd/pxe_utils.h
+++ b/cmd/pxe_utils.h
@@ -43,6 +43,7 @@ struct pxe_label {
 	char *initrd;
 	char *fdt;
 	char *fdtdir;
+	char *fdtoverlays;
 	int ipappend;
 	int attempted;
 	int localboot;
--- a/common/fdt_support.c
+++ b/common/fdt_support.c
@@ -1822,3 +1822,49 @@ int fdt_overlay_apply_verbose(void *fdt, void *fdto)
 	return err;
 }
 #endif
+
+/**
+ * fdt_valid() - Check if an FDT is valid. If not, change it to NULL
+ *
+ * @blobp: Pointer to FDT pointer
+ * @return 1 if OK, 0 if bad (in which case *blobp is set to NULL)
+ */
+int fdt_valid(struct fdt_header **blobp)
+{
+	const void *blob = *blobp;
+	int err;
+
+	if (!blob) {
+		printf("The address of the fdt is invalid (NULL).\n");
+		return 0;
+	}
+
+	err = fdt_check_header(blob);
+	if (err == 0)
+		return 1;	/* valid */
+
+	if (err < 0) {
+		printf("libfdt fdt_check_header(): %s", fdt_strerror(err));
+		/*
+		 * Be more informative on bad version.
+		 */
+		if (err == -FDT_ERR_BADVERSION) {
+			if (fdt_version(blob) <
+			    FDT_FIRST_SUPPORTED_VERSION) {
+				printf(" - too old, fdt %d < %d",
+				       fdt_version(blob),
+				       FDT_FIRST_SUPPORTED_VERSION);
+			}
+			if (fdt_last_comp_version(blob) >
+			    FDT_LAST_SUPPORTED_VERSION) {
+				printf(" - too new, fdt %d > %d",
+				       fdt_version(blob),
+				       FDT_LAST_SUPPORTED_VERSION);
+			}
+		}
+		printf("\n");
+		*blobp = NULL;
+		return 0;
+	}
+	return 1;
+}
--- a/common/spl/spl.c
+++ b/common/spl/spl.c
@@ -735,6 +735,30 @@ void board_init_r(gd_t *dummy1, ulong dummy2)
 	jump_to_image_no_args(&spl_image);
 }

+static void print_ruyisdk_logo(void)
+{
+	//  _____             _  _____ _____  _  __
+	// |  __ \           (_)/ ____|  __ \| |/ /
+	// | |__) |   _ _   _ _| (___ | |  | | ' / 
+	// |  _  / | | | | | | |\___ \| |  | |  <  
+	// | | \ \ |_| | |_| | |____) | |__| | . \ 
+	// |_|  \_\__,_|\__, |_|_____/|_____/|_|\_\
+	//               __/ |                     
+	//              |___/                      
+
+	printf("-----------------------------------------\n");
+	printf("  _____             _  _____ _____  _  __\n");
+	printf(" |  __ \\           (_)/ ____|  __ \\| |/ /\n");
+	printf(" | |__) |   _ _   _ _| (___ | |  | | ' / \n");
+	printf(" |  _  / | | | | | | |\\___ \\| |  | |  <  \n");
+	printf(" | | \\ \\ |_| | |_| | |____) | |__| | . \\ \n");
+	printf(" |_|  \\_\\__,_|\\__, |_|_____/|_____/|_|\\_\\\n");
+	printf("               __/ |                     \n");
+	printf("              |___/                      \n");
+	printf("                    -- Presented by ISCAS\n");
+	printf("-----------------------------------------\n");
+}
+
 #ifdef CONFIG_SPL_SERIAL_SUPPORT
 /*
 * This requires UART clocks to be enabled.  In order for this to work the
@@ -748,6 +772,8 @@ void preloader_console_init(void)

 	gd->have_console = 1;

+	print_ruyisdk_logo();
+
 #if CONFIG_IS_ENABLED(BANNER_PRINT)
 	puts("\nU-Boot " SPL_TPL_NAME " " PLAIN_VERSION " (" U_BOOT_DATE " - "
 	     U_BOOT_TIME " " U_BOOT_TZ ")\n");
--- a/configs/light_a_val_defconfig
+++ b/configs/light_a_val_defconfig
@@ -6,6 +6,7 @@ CONFIG_NR_DRAM_BANKS=8
 CONFIG_SPL=y
 CONFIG_SMP=y
 CONFIG_TARGET_LIGHT_C910=y
+CONFIG_TARGET_LIGHT_FM_C910_VAL_A=y
 # CONFIG_THEAD_PLIC is not set
 # CONFIG_THEAD_LIGHT_TIMER is not set
 # CONFIG_THEAD_LIGHT_DIGITAL_SENSOR is not set
@@ -17,7 +18,7 @@ CONFIG_DISPLAY_BOARDINFO=y
 # CONFIG_SPL_LEGACY_IMAGE_SUPPORT is not set
 CONFIG_SPL_RAM_SUPPORT=y
 CONFIG_SPL_RAM_DEVICE=y
-CONFIG_SYS_PROMPT="C910 Light# "
+CONFIG_SYS_PROMPT="Light VAL-A# "
 CONFIG_DDR_LP4X_3733_SINGLERANK=y
 # CONFIG_DDR_LP4_3733_DUALRANK is not set
 CONFIG_DDR_BOARD_CONFIG=y
@@ -63,6 +64,7 @@ CONFIG_MMC_SDHCI_SNPS=y
 CONFIG_MMC_SDHCI_SDMA=y
 CONFIG_CMD_MMC=y
 CONFIG_CMD_MMC_RPMB=y
+CONFIG_CMD_USB_MASS_STORAGE=y
 CONFIG_SUPPORT_EMMC_RPMB=y
 CONFIG_DM_MTD=y
 CONFIG_MTD_SPI_NAND=y
@@ -85,9 +87,11 @@ CONFIG_USB_GADGET=y
 CONFIG_USB_GADGET_MANUFACTURER="U-Boot-THEAD"
 CONFIG_USB_GADGET_VENDOR_NUM=0x1234
 CONFIG_USB_GADGET_PRODUCT_NUM=0x8888
+CONFIG_USB_FUNCTION_MASS_STORAGE=y
 # CONFIG_SPL_USE_TINY_PRINTF is not set
 # CONFIG_EFI_LOADER is not set
-# CONFIG_LIGHT_BOOT_FORCE_SEQ is not set
+# CONFIG_LIGHT_SEC_BOOT is not set
+CONFIG_DEFAULT_FDT_FILE="light-a-val.dtb"
 CONFIG_BOARD_LATE_INIT=y
 CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y
 CONFIG_DM_VIDEO=y
@@ -107,5 +111,6 @@ CONFIG_PMIC_VOL_INIT=y
 CONFIG_DDR_REGU_0V6=600000
 CONFIG_DDR_REGU_0V8=800000
 CONFIG_DDR_REGU_1V1=1100000
+CONFIG_BOARD_RNG_SEED=y
 CONFIG_MISC=y
 CONFIG_LIGHT_AON_CONF=y
--- a/configs/light_a_val_sec_defconfig
+++ b/configs/light_a_val_sec_defconfig
@@ -25,7 +25,6 @@ CONFIG_FIXUP_MEMORY_REGION=y
 # CONFIG_CMD_TPM_V2 is not set
 # CONFIG_CMD_TPM is not set
 # CONFIG_CMD_TPM_TEST is not set
-# CONFIG_CMD_MEASURED_BOOT is not set
 CONFIG_CMD_BOOT_SLAVE=y
 CONFIG_CMD_ERASEENV=y
 CONFIG_CMD_GPT=y
@@ -115,5 +114,3 @@ CONFIG_DDR_REGU_0V8=800000
 CONFIG_DDR_REGU_1V1=1100000
 CONFIG_MISC=y
 CONFIG_LIGHT_AON_CONF=y
-# CONFIG_FASTBOOT_CMD_OEM_NV_OPERATION is not set
-# CONFIG_FASTBOOT_ECIES_AUTH is not set
--- a/configs/light_b_product_sec_defconfig
+++ b/configs/light_b_product_sec_defconfig
@@ -107,5 +107,3 @@ CONFIG_DDR_REGU_0V8=800000
 CONFIG_DDR_REGU_1V1=1100000
 CONFIG_MISC=y
 CONFIG_LIGHT_AON_CONF=y
-# CONFIG_FASTBOOT_CMD_OEM_NV_OPERATION is not set
-# CONFIG_FASTBOOT_ECIES_AUTH is not set
--- a/configs/light_beagle_defconfig
+++ b/configs/light_beagle_defconfig
@@ -6,39 +6,41 @@ CONFIG_NR_DRAM_BANKS=8
 CONFIG_SPL=y
 CONFIG_SMP=y
 CONFIG_TARGET_LIGHT_C910=y
+CONFIG_PMIC_VOL_INIT=y
 CONFIG_TARGET_LIGHT_FM_C910_BEAGLE=y
-# CONFIG_THEAD_PLIC is not set
-# CONFIG_THEAD_LIGHT_TIMER is not set
-# CONFIG_THEAD_LIGHT_DIGITAL_SENSOR is not set
+CONFIG_DDR_LP4X_3733_SINGLERANK=y
+CONFIG_DDR_BOARD_CONFIG=y
 CONFIG_ARCH_RV64I=y
 CONFIG_DISTRO_DEFAULTS=y
 CONFIG_BUILD_TARGET="u-boot-with-spl.bin"
+CONFIG_DEFAULT_FDT_FILE="thead/light-beagle.dtb"
+CONFIG_BOARD_LATE_INIT=y
 CONFIG_DISPLAY_CPUINFO=y
 CONFIG_DISPLAY_BOARDINFO=y
 # CONFIG_SPL_LEGACY_IMAGE_SUPPORT is not set
 CONFIG_SPL_RAM_SUPPORT=y
 CONFIG_SPL_RAM_DEVICE=y
-CONFIG_SYS_PROMPT="C910 Light# "
-CONFIG_DDR_LP4X_3733_SINGLERANK=y
-# CONFIG_DDR_LP4_3733_DUALRANK is not set
-CONFIG_DDR_BOARD_CONFIG=y
+CONFIG_SYS_PROMPT="Light AHead# "
 CONFIG_CMD_BOOT_SLAVE=y
 CONFIG_CMD_ERASEENV=y
-CONFIG_CMD_GPT=y
-CONFIG_CMD_MTD=y
-CONFIG_CMD_EXT4_WRITE=y
-CONFIG_CMD_SPI=y
-CONFIG_CMD_I2C=y
 CONFIG_CMD_MEMTEST=y
 CONFIG_DDR_SCAN=y
-CONFIG_DDR_PRBS_TEST=n
+CONFIG_CMD_GPT=y
+CONFIG_CMD_I2C=y
+CONFIG_CMD_MTD=y
+CONFIG_CMD_SPI=y
+CONFIG_CMD_BMP=y
+CONFIG_CMD_EXT4_WRITE=y
 # CONFIG_DOS_PARTITION is not set
 # CONFIG_ISO_PARTITION is not set
 CONFIG_PARTITION_TYPE_GUID=y
 CONFIG_OF_EMBED=y
-CONFIG_DEFAULT_DEVICE_TREE="light-a-val"
+CONFIG_DEFAULT_DEVICE_TREE="light-beagle"
 CONFIG_ENV_IS_IN_MMC=y
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
+CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y
+CONFIG_REGMAP=y
+CONFIG_SYSCON=y
 CONFIG_SPL_CLK=y
 CONFIG_USB_FUNCTION_FASTBOOT=y
 CONFIG_UDP_FUNCTION_FASTBOOT=y
@@ -47,11 +49,12 @@ CONFIG_FASTBOOT_FLASH=y
 CONFIG_FASTBOOT_FLASH_MMC_DEV=0
 CONFIG_FASTBOOT_CMD_OEM_FORMAT=y
 CONFIG_DM_GPIO=y
+CONFIG_DWAPB_GPIO=y
+CONFIG_DM_PCA953X=y
 CONFIG_DM_I2C=y
 CONFIG_SYS_I2C_DW=y
-CONFIG_DWAPB_GPIO=y
 # CONFIG_MMC_SPI is not set
-CONFIG_MMC_VERBOSE=y
+CONFIG_SUPPORT_EMMC_RPMB=y
 CONFIG_SUPPORT_EMMC_BOOT=y
 CONFIG_MMC_IO_VOLTAGE=y
 CONFIG_MMC_UHS_SUPPORT=y
@@ -59,19 +62,21 @@ CONFIG_MMC_HS400_SUPPORT=y
 CONFIG_MMC_DW=y
 CONFIG_MMC_DW_SNPS=y
 CONFIG_MMC_SDHCI=y
-CONFIG_MMC_SDHCI_SNPS=y
 CONFIG_MMC_SDHCI_SDMA=y
+CONFIG_MMC_SDHCI_SNPS=y
 CONFIG_CMD_MMC=y
 CONFIG_CMD_MMC_RPMB=y
+CONFIG_CMD_USB_MASS_STORAGE=y
 CONFIG_SUPPORT_EMMC_RPMB=y
 CONFIG_DM_MTD=y
 CONFIG_MTD_SPI_NAND=y
 CONFIG_SPI_FLASH_WINBOND=y
-CONFIG_ETH_DESIGNWARE=y
 CONFIG_PHY_REALTEK=y
 CONFIG_RTL8211E_PINE64_GIGABIT_FIX=y
 CONFIG_RTL8211X_PHY_FORCE_MASTER=y
 CONFIG_RTL8211F_PHY_FORCE_EEE_RXC_ON=y
+CONFIG_ETH_DESIGNWARE=y
+CONFIG_PHY=y
 CONFIG_SYS_NS16550=y
 CONFIG_SPI=y
 CONFIG_DESIGNWARE_SPI=y
@@ -82,25 +87,18 @@ CONFIG_USB_GADGET=y
 CONFIG_USB_GADGET_MANUFACTURER="U-Boot-THEAD"
 CONFIG_USB_GADGET_VENDOR_NUM=0x1234
 CONFIG_USB_GADGET_PRODUCT_NUM=0x8888
-# CONFIG_SPL_USE_TINY_PRINTF is not set
-# CONFIG_EFI_LOADER is not set
-# CONFIG_LIGHT_SEC_BOOT is not set
-CONFIG_BOARD_LATE_INIT=y
-CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y
+CONFIG_USB_FUNCTION_MASS_STORAGE=y
 CONFIG_DM_VIDEO=y
-CONFIG_PHY=y
-CONFIG_REGMAP=y
-CONFIG_SYSCON=y
-CONFIG_CMD_BMP=y
-CONFIG_VIDEO_BRIDGE=y
-CONFIG_DM_PCA953X=y
-CONFIG_VIDEO_VS_DPU=y
+CONFIG_SYS_WHITE_ON_BLACK=y
 CONFIG_VIDEO_LCD_ILITEK_ILI9881C=y
+CONFIG_VIDEO_BRIDGE=y
+CONFIG_VIDEO_VS_DPU=y
 CONFIG_VIDEO_DW_DSI_LIGHT=y
 CONFIG_VIDEO_DW_DPHY=y
-CONFIG_VIDEO_DW_DSI_HOST=y
-CONFIG_SYS_WHITE_ON_BLACK=y
-CONFIG_PMIC_VOL_INIT=y
-CONFIG_DDR_REGU_0V6=600000
-CONFIG_DDR_REGU_0V8=800000
-CONFIG_DDR_REGU_1V1=1100000
+# CONFIG_SPL_USE_TINY_PRINTF is not set
+CONFIG_OF_LIBFDT_OVERLAY=y
+# CONFIG_EFI_LOADER is not set
+CONFIG_BOARD_RNG_SEED=y
+CONFIG_FIXUP_MEMORY_REGION=y
+CONFIG_MISC=y
+CONFIG_LIGHT_AON_CONF=y
--- a/configs/light_huiwei_defconfig
+++ b/configs/light_huiwei_defconfig
@@ -1,4 +1,3 @@
-CONFIG_RV_BOOK=y
 CONFIG_RISCV=y
 CONFIG_SPL_MMC_SUPPORT=y
 CONFIG_ENV_SIZE=0x20000
@@ -7,7 +6,7 @@ CONFIG_NR_DRAM_BANKS=8
 CONFIG_SPL=y
 CONFIG_SMP=y
 CONFIG_TARGET_LIGHT_C910=y
-CONFIG_TARGET_LIGHT_FM_C910_RVBOOK=y
+CONFIG_TARGET_LIGHT_FM_C910_LPI4A=y
 # CONFIG_THEAD_PLIC is not set
 # CONFIG_THEAD_LIGHT_TIMER is not set
 # CONFIG_THEAD_LIGHT_DIGITAL_SENSOR is not set
@@ -19,7 +18,7 @@ CONFIG_DISPLAY_BOARDINFO=y
 # CONFIG_SPL_LEGACY_IMAGE_SUPPORT is not set
 CONFIG_SPL_RAM_SUPPORT=y
 CONFIG_SPL_RAM_DEVICE=y
-CONFIG_SYS_PROMPT="C910 Light# "
+CONFIG_SYS_PROMPT="Light huiwei# "
 CONFIG_DDR_LP4X_3733_DUALRANK=y
 # CONFIG_DDR_LP4_3733_DUALRANK is not set
 CONFIG_DDR_BOARD_CONFIG=y
@@ -34,11 +33,10 @@ CONFIG_CMD_I2C=y
 CONFIG_CMD_MEMTEST=y
 CONFIG_DDR_SCAN=y
 CONFIG_DDR_PRBS_TEST=n
-# CONFIG_DOS_PARTITION is not set
 # CONFIG_ISO_PARTITION is not set
 CONFIG_PARTITION_TYPE_GUID=y
 CONFIG_OF_EMBED=y
-CONFIG_DEFAULT_DEVICE_TREE="th1520-rvbook"
+CONFIG_DEFAULT_DEVICE_TREE="light-huiwei"
 CONFIG_ENV_IS_IN_MMC=y
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
 CONFIG_SPL_CLK=y
@@ -65,6 +63,7 @@ CONFIG_MMC_SDHCI_SNPS=y
 CONFIG_MMC_SDHCI_SDMA=y
 CONFIG_CMD_MMC=y
 CONFIG_CMD_MMC_RPMB=y
+CONFIG_CMD_USB_MASS_STORAGE=y
 CONFIG_SUPPORT_EMMC_RPMB=y
 CONFIG_DM_MTD=y
 CONFIG_MTD_SPI_NAND=y
@@ -79,14 +78,19 @@ CONFIG_SPI=y
 CONFIG_DESIGNWARE_SPI=y
 CONFIG_DESIGNWARE_QSPI=y
 CONFIG_USB=y
+CONFIG_DM_USB=y
+CONFIG_USB_XHCI_HCD=y
+CONFIG_USB_XHCI_DWC3=y
 CONFIG_USB_DWC3=y
 CONFIG_USB_GADGET=y
 CONFIG_USB_GADGET_MANUFACTURER="U-Boot-THEAD"
 CONFIG_USB_GADGET_VENDOR_NUM=0x1234
 CONFIG_USB_GADGET_PRODUCT_NUM=0x8888
+CONFIG_USB_FUNCTION_MASS_STORAGE=y
 # CONFIG_SPL_USE_TINY_PRINTF is not set
 # CONFIG_EFI_LOADER is not set
 # CONFIG_LIGHT_SEC_BOOT is not set
+CONFIG_DEFAULT_FDT_FILE="thead/th1520-huiwei-product.dtb"
 CONFIG_BOARD_LATE_INIT=y
 CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y
 CONFIG_DM_VIDEO=y
@@ -94,11 +98,13 @@ CONFIG_PHY=y
 CONFIG_REGMAP=y
 CONFIG_SYSCON=y
 CONFIG_CMD_BMP=y
+CONFIG_CMD_USB=y
 CONFIG_VIDEO_BRIDGE=y
 CONFIG_DM_PCA953X=y
 CONFIG_VIDEO_VS_DPU=y
-CONFIG_VIDEO_LCD_ILITEK_ILI9881C=y
-CONFIG_VIDEO_LCD_CUSTOM_LOGO=y
+CONFIG_VIDEO_LCD_ILITEK_ILI9881C=n
+CONFIG_VIDEO_LCD_JD9365DA=y
+#CONFIG_VIDEO_LCD_CUSTOM_LOGO=y
 CONFIG_VIDEO_DW_DSI_LIGHT=y
 CONFIG_VIDEO_DW_DPHY=y
 CONFIG_VIDEO_DW_DSI_HOST=y
@@ -107,6 +113,9 @@ CONFIG_PMIC_VOL_INIT=y
 CONFIG_DDR_REGU_0V6=600000
 CONFIG_DDR_REGU_0V8=800000
 CONFIG_DDR_REGU_1V1=1100000
+CONFIG_BOARD_RNG_SEED=y
+CONFIG_MISC=y
+CONFIG_LIGHT_AON_CONF=y
 CONFIG_TPM=y
 CONFIG_TPM_V2=y
 CONFIG_TPM_Z32H330TC_SPI=y
@@ -126,5 +135,3 @@ CONFIG_DM_POWER_DELIVERY=y
 CONFIG_TYPEC_TCPM=y
 CONFIG_TYPEC_TCPCI=y
 CONFIG_TYPEC_HUSB311=y
-CONFIG_MISC=y
-CONFIG_LIGHT_AON_CONF=y
--- a/configs/light_rvbook_sec_defconfig
+++ b/configs/light_rvbook_sec_defconfig
@@ -1,4 +1,3 @@
-CONFIG_RV_BOOK=y
 CONFIG_RISCV=y
 CONFIG_SPL_MMC_SUPPORT=y
 CONFIG_ENV_SIZE=0x20000
@@ -7,6 +6,7 @@ CONFIG_NR_DRAM_BANKS=8
 CONFIG_SPL=y
 CONFIG_SMP=y
 CONFIG_TARGET_LIGHT_C910=y
+CONFIG_TARGET_LIGHT_FM_C910_LPI4A=y
 # CONFIG_THEAD_PLIC is not set
 # CONFIG_THEAD_LIGHT_TIMER is not set
 # CONFIG_THEAD_LIGHT_DIGITAL_SENSOR is not set
@@ -18,11 +18,11 @@ CONFIG_DISPLAY_BOARDINFO=y
 # CONFIG_SPL_LEGACY_IMAGE_SUPPORT is not set
 CONFIG_SPL_RAM_SUPPORT=y
 CONFIG_SPL_RAM_DEVICE=y
-CONFIG_SYS_PROMPT="C910 Light# "
+CONFIG_SYS_PROMPT="Light LPI4A 16G# "
 CONFIG_DDR_LP4X_3733_DUALRANK=y
+CONFIG_DDR_DDP=y
 # CONFIG_DDR_LP4_3733_DUALRANK is not set
 CONFIG_DDR_BOARD_CONFIG=y
-CONFIG_FIXUP_MEMORY_REGION=y
 CONFIG_CMD_BOOT_SLAVE=y
 CONFIG_CMD_ERASEENV=y
 CONFIG_CMD_GPT=y
@@ -37,7 +37,7 @@ CONFIG_DDR_PRBS_TEST=n
 # CONFIG_ISO_PARTITION is not set
 CONFIG_PARTITION_TYPE_GUID=y
 CONFIG_OF_EMBED=y
-CONFIG_DEFAULT_DEVICE_TREE="th1520-rvbook"
+CONFIG_DEFAULT_DEVICE_TREE="light-lpi4a"
 CONFIG_ENV_IS_IN_MMC=y
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
 CONFIG_SPL_CLK=y
@@ -64,6 +64,7 @@ CONFIG_MMC_SDHCI_SNPS=y
 CONFIG_MMC_SDHCI_SDMA=y
 CONFIG_CMD_MMC=y
 CONFIG_CMD_MMC_RPMB=y
+CONFIG_CMD_USB_MASS_STORAGE=y
 CONFIG_SUPPORT_EMMC_RPMB=y
 CONFIG_DM_MTD=y
 CONFIG_MTD_SPI_NAND=y
@@ -83,11 +84,11 @@ CONFIG_USB_GADGET=y
 CONFIG_USB_GADGET_MANUFACTURER="U-Boot-THEAD"
 CONFIG_USB_GADGET_VENDOR_NUM=0x1234
 CONFIG_USB_GADGET_PRODUCT_NUM=0x8888
+CONFIG_USB_FUNCTION_MASS_STORAGE=y
 # CONFIG_SPL_USE_TINY_PRINTF is not set
 # CONFIG_EFI_LOADER is not set
-
-CONFIG_LIGHT_SEC_BOOT_WITH_VERIFY_RVBOOK=y
-CONFIG_LIGHT_SEC_UPGRADE=y
+# CONFIG_LIGHT_SEC_BOOT is not set
+CONFIG_DEFAULT_FDT_FILE="thead/light-lpi4a-16gb.dtb"
 CONFIG_BOARD_LATE_INIT=y
 CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y
 CONFIG_DM_VIDEO=y
@@ -99,7 +100,6 @@ CONFIG_VIDEO_BRIDGE=y
 CONFIG_DM_PCA953X=y
 CONFIG_VIDEO_VS_DPU=y
 CONFIG_VIDEO_LCD_ILITEK_ILI9881C=y
-CONFIG_VIDEO_LCD_CUSTOM_LOGO=y
 CONFIG_VIDEO_DW_DSI_LIGHT=y
 CONFIG_VIDEO_DW_DPHY=y
 CONFIG_VIDEO_DW_DSI_HOST=y
@@ -108,25 +108,7 @@ CONFIG_PMIC_VOL_INIT=y
 CONFIG_DDR_REGU_0V6=600000
 CONFIG_DDR_REGU_0V8=800000
 CONFIG_DDR_REGU_1V1=1100000
-CONFIG_TPM=y
-CONFIG_TPM_V2=y
-CONFIG_TPM_Z32H330TC_SPI=y
-CONFIG_CMD_TPM=y
-CONFIG_CMD_TPM_V2=y
-CONFIG_CMD_TPM_TEST=y
-CONFIG_DM_CHARGE_DISPLAY=y
-CONFIG_CHARGE_ANIMATION=y
-CONFIG_DM_FUEL_GAUGE=y
-CONFIG_POWER_FG_CW201X=y
-CONFIG_CHARGER_BQ25700=y
-CONFIG_LED=y
-CONFIG_LED_GPIO=y
-CONFIG_DM_MCU=y
-CONFIG_MCU_HC32fX=y
-CONFIG_DM_POWER_DELIVERY=y
-CONFIG_TYPEC_TCPM=y
-CONFIG_TYPEC_TCPCI=y
-CONFIG_TYPEC_HUSB311=y
+CONFIG_BOARD_RNG_SEED=y
+CONFIG_FIXUP_MEMORY_REGION=y
 CONFIG_MISC=y
 CONFIG_LIGHT_AON_CONF=y
-CONFIG_FASTBOOT_CMD_OEM_NV_OPERATION=y
--- a/configs/light_lpi4a_android_defconfig
+++ b/configs/light_lpi4a_android_defconfig
@@ -19,7 +19,7 @@ CONFIG_SYS_PROMPT="C910 Light# "
 CONFIG_DDR_LP4X_3733_DUALRANK=y
 # CONFIG_DDR_LP4_3733_DUALRANK is not set
 CONFIG_DDR_BOARD_CONFIG=y
-CONFIG_FIXUP_MEMORY_REGION=y
+CONFIG_FIXUP_MEMORY_REGION=n
 CONFIG_CMD_BOOT_SLAVE=y
 CONFIG_CMD_ERASEENV=y
 CONFIG_CMD_GPT=y
@@ -93,7 +93,7 @@ CONFIG_CMD_BMP=y
 CONFIG_VIDEO_BRIDGE=y
 CONFIG_DM_PCA953X=y
 CONFIG_VIDEO_VS_DPU=y
-CONFIG_VIDEO_LCD_JD9365DA=y
+CONFIG_VIDEO_LCD_ILITEK_ILI9881C=y
 CONFIG_VIDEO_DW_DSI_LIGHT=y
 CONFIG_VIDEO_DW_DPHY=y
 CONFIG_VIDEO_DW_DSI_HOST=y
--- a/configs/light_lpi4a_cluster_16g_defconfig
+++ b/configs/light_lpi4a_cluster_16g_defconfig
@@ -0,0 +1,114 @@
+CONFIG_RISCV=y
+CONFIG_SPL_MMC_SUPPORT=y
+CONFIG_ENV_SIZE=0x20000
+CONFIG_ENV_OFFSET=0xe0000
+CONFIG_NR_DRAM_BANKS=8
+CONFIG_SPL=y
+CONFIG_SMP=y
+CONFIG_TARGET_LIGHT_C910=y
+CONFIG_TARGET_LIGHT_FM_C910_LPI4A=y
+# CONFIG_THEAD_PLIC is not set
+# CONFIG_THEAD_LIGHT_TIMER is not set
+# CONFIG_THEAD_LIGHT_DIGITAL_SENSOR is not set
+CONFIG_ARCH_RV64I=y
+CONFIG_DISTRO_DEFAULTS=y
+CONFIG_BUILD_TARGET="u-boot-with-spl.bin"
+CONFIG_DISPLAY_CPUINFO=y
+CONFIG_DISPLAY_BOARDINFO=y
+# CONFIG_SPL_LEGACY_IMAGE_SUPPORT is not set
+CONFIG_SPL_RAM_SUPPORT=y
+CONFIG_SPL_RAM_DEVICE=y
+CONFIG_SYS_PROMPT="LicheeCluster4A 16G # "
+CONFIG_DDR_LP4X_3733_DUALRANK=y
+CONFIG_DDR_DDP=y
+# CONFIG_DDR_LP4_3733_DUALRANK is not set
+CONFIG_DDR_BOARD_CONFIG=y
+CONFIG_CMD_BOOT_SLAVE=y
+CONFIG_CMD_ERASEENV=y
+CONFIG_CMD_GPT=y
+CONFIG_CMD_MTD=y
+CONFIG_CMD_EXT4_WRITE=y
+CONFIG_CMD_SPI=y
+CONFIG_CMD_I2C=y
+CONFIG_CMD_MEMTEST=y
+CONFIG_DDR_SCAN=y
+CONFIG_DDR_PRBS_TEST=n
+# CONFIG_DOS_PARTITION is not set
+# CONFIG_ISO_PARTITION is not set
+CONFIG_PARTITION_TYPE_GUID=y
+CONFIG_OF_EMBED=y
+CONFIG_DEFAULT_DEVICE_TREE="light-lpi4a"
+CONFIG_ENV_IS_IN_MMC=y
+CONFIG_SYS_RELOC_GD_ENV_ADDR=y
+CONFIG_SPL_CLK=y
+CONFIG_USB_FUNCTION_FASTBOOT=y
+CONFIG_UDP_FUNCTION_FASTBOOT=y
+CONFIG_FASTBOOT_BUF_ADDR=0x10000000
+CONFIG_FASTBOOT_FLASH=y
+CONFIG_FASTBOOT_FLASH_MMC_DEV=0
+CONFIG_FASTBOOT_CMD_OEM_FORMAT=y
+CONFIG_DM_GPIO=y
+CONFIG_DM_I2C=y
+CONFIG_SYS_I2C_DW=y
+CONFIG_DWAPB_GPIO=y
+# CONFIG_MMC_SPI is not set
+CONFIG_MMC_VERBOSE=y
+CONFIG_SUPPORT_EMMC_BOOT=y
+CONFIG_MMC_IO_VOLTAGE=y
+CONFIG_MMC_UHS_SUPPORT=y
+CONFIG_MMC_HS400_SUPPORT=y
+CONFIG_MMC_DW=y
+CONFIG_MMC_DW_SNPS=y
+CONFIG_MMC_SDHCI=y
+CONFIG_MMC_SDHCI_SNPS=y
+CONFIG_MMC_SDHCI_SDMA=y
+CONFIG_CMD_MMC=y
+CONFIG_CMD_MMC_RPMB=y
+CONFIG_CMD_USB_MASS_STORAGE=y
+CONFIG_SUPPORT_EMMC_RPMB=y
+CONFIG_DM_MTD=y
+CONFIG_MTD_SPI_NAND=y
+CONFIG_SPI_FLASH_WINBOND=y
+CONFIG_ETH_DESIGNWARE=y
+CONFIG_PHY_REALTEK=y
+CONFIG_RTL8211E_PINE64_GIGABIT_FIX=y
+CONFIG_RTL8211X_PHY_FORCE_MASTER=y
+CONFIG_RTL8211F_PHY_FORCE_EEE_RXC_ON=y
+CONFIG_SYS_NS16550=y
+CONFIG_SPI=y
+CONFIG_DESIGNWARE_SPI=y
+CONFIG_DESIGNWARE_QSPI=y
+CONFIG_USB=y
+CONFIG_USB_DWC3=y
+CONFIG_USB_GADGET=y
+CONFIG_USB_GADGET_MANUFACTURER="U-Boot-THEAD"
+CONFIG_USB_GADGET_VENDOR_NUM=0x1234
+CONFIG_USB_GADGET_PRODUCT_NUM=0x8888
+CONFIG_USB_FUNCTION_MASS_STORAGE=y
+# CONFIG_SPL_USE_TINY_PRINTF is not set
+# CONFIG_EFI_LOADER is not set
+# CONFIG_LIGHT_SEC_BOOT is not set
+CONFIG_DEFAULT_FDT_FILE="thead/light-lpi4a-cluster-16gb.dtb"
+CONFIG_BOARD_LATE_INIT=y
+CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y
+CONFIG_DM_VIDEO=y
+CONFIG_PHY=y
+CONFIG_REGMAP=y
+CONFIG_SYSCON=y
+CONFIG_CMD_BMP=y
+CONFIG_VIDEO_BRIDGE=y
+CONFIG_DM_PCA953X=y
+CONFIG_VIDEO_VS_DPU=y
+CONFIG_VIDEO_LCD_ILITEK_ILI9881C=y
+CONFIG_VIDEO_DW_DSI_LIGHT=y
+CONFIG_VIDEO_DW_DPHY=y
+CONFIG_VIDEO_DW_DSI_HOST=y
+CONFIG_SYS_WHITE_ON_BLACK=y
+CONFIG_PMIC_VOL_INIT=y
+CONFIG_DDR_REGU_0V6=600000
+CONFIG_DDR_REGU_0V8=800000
+CONFIG_DDR_REGU_1V1=1100000
+CONFIG_BOARD_RNG_SEED=y
+CONFIG_FIXUP_MEMORY_REGION=y
+CONFIG_MISC=y
+CONFIG_LIGHT_AON_CONF=y
--- a/configs/light_lpi4a_cluster_defconfig
+++ b/configs/light_lpi4a_cluster_defconfig
@@ -0,0 +1,113 @@
+CONFIG_RISCV=y
+CONFIG_SPL_MMC_SUPPORT=y
+CONFIG_ENV_SIZE=0x20000
+CONFIG_ENV_OFFSET=0xe0000
+CONFIG_NR_DRAM_BANKS=8
+CONFIG_SPL=y
+CONFIG_SMP=y
+CONFIG_TARGET_LIGHT_C910=y
+CONFIG_TARGET_LIGHT_FM_C910_LPI4A=y
+# CONFIG_THEAD_PLIC is not set
+# CONFIG_THEAD_LIGHT_TIMER is not set
+# CONFIG_THEAD_LIGHT_DIGITAL_SENSOR is not set
+CONFIG_ARCH_RV64I=y
+CONFIG_DISTRO_DEFAULTS=y
+CONFIG_BUILD_TARGET="u-boot-with-spl.bin"
+CONFIG_DISPLAY_CPUINFO=y
+CONFIG_DISPLAY_BOARDINFO=y
+# CONFIG_SPL_LEGACY_IMAGE_SUPPORT is not set
+CONFIG_SPL_RAM_SUPPORT=y
+CONFIG_SPL_RAM_DEVICE=y
+CONFIG_SYS_PROMPT="LicheeCluster4A # "
+CONFIG_DDR_LP4X_3733_DUALRANK=y
+# CONFIG_DDR_LP4_3733_DUALRANK is not set
+CONFIG_DDR_BOARD_CONFIG=y
+CONFIG_CMD_BOOT_SLAVE=y
+CONFIG_CMD_ERASEENV=y
+CONFIG_CMD_GPT=y
+CONFIG_CMD_MTD=y
+CONFIG_CMD_EXT4_WRITE=y
+CONFIG_CMD_SPI=y
+CONFIG_CMD_I2C=y
+CONFIG_CMD_MEMTEST=y
+CONFIG_DDR_SCAN=y
+CONFIG_DDR_PRBS_TEST=n
+# CONFIG_DOS_PARTITION is not set
+# CONFIG_ISO_PARTITION is not set
+CONFIG_PARTITION_TYPE_GUID=y
+CONFIG_OF_EMBED=y
+CONFIG_DEFAULT_DEVICE_TREE="light-lpi4a"
+CONFIG_ENV_IS_IN_MMC=y
+CONFIG_SYS_RELOC_GD_ENV_ADDR=y
+CONFIG_SPL_CLK=y
+CONFIG_USB_FUNCTION_FASTBOOT=y
+CONFIG_UDP_FUNCTION_FASTBOOT=y
+CONFIG_FASTBOOT_BUF_ADDR=0x10000000
+CONFIG_FASTBOOT_FLASH=y
+CONFIG_FASTBOOT_FLASH_MMC_DEV=0
+CONFIG_FASTBOOT_CMD_OEM_FORMAT=y
+CONFIG_DM_GPIO=y
+CONFIG_DM_I2C=y
+CONFIG_SYS_I2C_DW=y
+CONFIG_DWAPB_GPIO=y
+# CONFIG_MMC_SPI is not set
+CONFIG_MMC_VERBOSE=y
+CONFIG_SUPPORT_EMMC_BOOT=y
+CONFIG_MMC_IO_VOLTAGE=y
+CONFIG_MMC_UHS_SUPPORT=y
+CONFIG_MMC_HS400_SUPPORT=y
+CONFIG_MMC_DW=y
+CONFIG_MMC_DW_SNPS=y
+CONFIG_MMC_SDHCI=y
+CONFIG_MMC_SDHCI_SNPS=y
+CONFIG_MMC_SDHCI_SDMA=y
+CONFIG_CMD_MMC=y
+CONFIG_CMD_MMC_RPMB=y
+CONFIG_CMD_USB_MASS_STORAGE=y
+CONFIG_SUPPORT_EMMC_RPMB=y
+CONFIG_DM_MTD=y
+CONFIG_MTD_SPI_NAND=y
+CONFIG_SPI_FLASH_WINBOND=y
+CONFIG_ETH_DESIGNWARE=y
+CONFIG_PHY_REALTEK=y
+CONFIG_RTL8211E_PINE64_GIGABIT_FIX=y
+CONFIG_RTL8211X_PHY_FORCE_MASTER=y
+CONFIG_RTL8211F_PHY_FORCE_EEE_RXC_ON=y
+CONFIG_SYS_NS16550=y
+CONFIG_SPI=y
+CONFIG_DESIGNWARE_SPI=y
+CONFIG_DESIGNWARE_QSPI=y
+CONFIG_USB=y
+CONFIG_USB_DWC3=y
+CONFIG_USB_GADGET=y
+CONFIG_USB_GADGET_MANUFACTURER="U-Boot-THEAD"
+CONFIG_USB_GADGET_VENDOR_NUM=0x1234
+CONFIG_USB_GADGET_PRODUCT_NUM=0x8888
+CONFIG_USB_FUNCTION_MASS_STORAGE=y
+# CONFIG_SPL_USE_TINY_PRINTF is not set
+# CONFIG_EFI_LOADER is not set
+# CONFIG_LIGHT_SEC_BOOT is not set
+CONFIG_DEFAULT_FDT_FILE="thead/light-lpi4a-cluster.dtb"
+CONFIG_BOARD_LATE_INIT=y
+CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y
+CONFIG_DM_VIDEO=y
+CONFIG_PHY=y
+CONFIG_REGMAP=y
+CONFIG_SYSCON=y
+CONFIG_CMD_BMP=y
+CONFIG_VIDEO_BRIDGE=y
+CONFIG_DM_PCA953X=y
+CONFIG_VIDEO_VS_DPU=y
+CONFIG_VIDEO_LCD_ILITEK_ILI9881C=y
+CONFIG_VIDEO_DW_DSI_LIGHT=y
+CONFIG_VIDEO_DW_DPHY=y
+CONFIG_VIDEO_DW_DSI_HOST=y
+CONFIG_SYS_WHITE_ON_BLACK=y
+CONFIG_PMIC_VOL_INIT=y
+CONFIG_DDR_REGU_0V6=600000
+CONFIG_DDR_REGU_0V8=800000
+CONFIG_DDR_REGU_1V1=1100000
+CONFIG_BOARD_RNG_SEED=y
+CONFIG_FIXUP_MEMORY_REGION=y
+CONFIG_MISC=y
+CONFIG_LIGHT_AON_CONF=y
--- a/configs/light_lpi4a_console_16g_defconfig
+++ b/configs/light_lpi4a_console_16g_defconfig
@@ -0,0 +1,114 @@
+CONFIG_RISCV=y
+CONFIG_SPL_MMC_SUPPORT=y
+CONFIG_ENV_SIZE=0x20000
+CONFIG_ENV_OFFSET=0xe0000
+CONFIG_NR_DRAM_BANKS=8
+CONFIG_SPL=y
+CONFIG_SMP=y
+CONFIG_TARGET_LIGHT_C910=y
+CONFIG_TARGET_LIGHT_FM_C910_LPI4A=y
+# CONFIG_THEAD_PLIC is not set
+# CONFIG_THEAD_LIGHT_TIMER is not set
+# CONFIG_THEAD_LIGHT_DIGITAL_SENSOR is not set
+CONFIG_ARCH_RV64I=y
+CONFIG_DISTRO_DEFAULTS=y
+CONFIG_BUILD_TARGET="u-boot-with-spl.bin"
+CONFIG_DISPLAY_CPUINFO=y
+CONFIG_DISPLAY_BOARDINFO=y
+# CONFIG_SPL_LEGACY_IMAGE_SUPPORT is not set
+CONFIG_SPL_RAM_SUPPORT=y
+CONFIG_SPL_RAM_DEVICE=y
+CONFIG_SYS_PROMPT="LicheeConsole4A 16G # "
+CONFIG_DDR_LP4X_3733_DUALRANK=y
+CONFIG_DDR_DDP=y
+# CONFIG_DDR_LP4_3733_DUALRANK is not set
+CONFIG_DDR_BOARD_CONFIG=y
+CONFIG_CMD_BOOT_SLAVE=y
+CONFIG_CMD_ERASEENV=y
+CONFIG_CMD_GPT=y
+CONFIG_CMD_MTD=y
+CONFIG_CMD_EXT4_WRITE=y
+CONFIG_CMD_SPI=y
+CONFIG_CMD_I2C=y
+CONFIG_CMD_MEMTEST=y
+CONFIG_DDR_SCAN=y
+CONFIG_DDR_PRBS_TEST=n
+# CONFIG_DOS_PARTITION is not set
+# CONFIG_ISO_PARTITION is not set
+CONFIG_PARTITION_TYPE_GUID=y
+CONFIG_OF_EMBED=y
+CONFIG_DEFAULT_DEVICE_TREE="light-lpi4a-laptop"
+CONFIG_ENV_IS_IN_MMC=y
+CONFIG_SYS_RELOC_GD_ENV_ADDR=y
+CONFIG_SPL_CLK=y
+CONFIG_USB_FUNCTION_FASTBOOT=y
+CONFIG_UDP_FUNCTION_FASTBOOT=y
+CONFIG_FASTBOOT_BUF_ADDR=0x10000000
+CONFIG_FASTBOOT_FLASH=y
+CONFIG_FASTBOOT_FLASH_MMC_DEV=0
+CONFIG_FASTBOOT_CMD_OEM_FORMAT=y
+CONFIG_DM_GPIO=y
+CONFIG_DM_I2C=y
+CONFIG_SYS_I2C_DW=y
+CONFIG_DWAPB_GPIO=y
+# CONFIG_MMC_SPI is not set
+CONFIG_MMC_VERBOSE=y
+CONFIG_SUPPORT_EMMC_BOOT=y
+CONFIG_MMC_IO_VOLTAGE=y
+CONFIG_MMC_UHS_SUPPORT=y
+CONFIG_MMC_HS400_SUPPORT=y
+CONFIG_MMC_DW=y
+CONFIG_MMC_DW_SNPS=y
+CONFIG_MMC_SDHCI=y
+CONFIG_MMC_SDHCI_SNPS=y
+CONFIG_MMC_SDHCI_SDMA=y
+CONFIG_CMD_MMC=y
+CONFIG_CMD_MMC_RPMB=y
+CONFIG_CMD_USB_MASS_STORAGE=y
+CONFIG_SUPPORT_EMMC_RPMB=y
+CONFIG_DM_MTD=y
+CONFIG_MTD_SPI_NAND=y
+CONFIG_SPI_FLASH_WINBOND=y
+CONFIG_ETH_DESIGNWARE=y
+CONFIG_PHY_REALTEK=y
+CONFIG_RTL8211E_PINE64_GIGABIT_FIX=y
+CONFIG_RTL8211X_PHY_FORCE_MASTER=y
+CONFIG_RTL8211F_PHY_FORCE_EEE_RXC_ON=y
+CONFIG_SYS_NS16550=y
+CONFIG_SPI=y
+CONFIG_DESIGNWARE_SPI=y
+CONFIG_DESIGNWARE_QSPI=y
+CONFIG_USB=y
+CONFIG_USB_DWC3=y
+CONFIG_USB_GADGET=y
+CONFIG_USB_GADGET_MANUFACTURER="U-Boot-THEAD"
+CONFIG_USB_GADGET_VENDOR_NUM=0x1234
+CONFIG_USB_GADGET_PRODUCT_NUM=0x8888
+CONFIG_USB_FUNCTION_MASS_STORAGE=y
+# CONFIG_SPL_USE_TINY_PRINTF is not set
+# CONFIG_EFI_LOADER is not set
+# CONFIG_LIGHT_SEC_BOOT is not set
+CONFIG_DEFAULT_FDT_FILE="thead/light-lpi4a-console-16g.dtb"
+CONFIG_BOARD_LATE_INIT=y
+CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y
+CONFIG_DM_VIDEO=y
+CONFIG_PHY=y
+CONFIG_REGMAP=y
+CONFIG_SYSCON=y
+CONFIG_CMD_BMP=y
+CONFIG_VIDEO_BRIDGE=y
+CONFIG_DM_PCA953X=y
+CONFIG_VIDEO_VS_DPU=y
+CONFIG_VIDEO_LCD_ILITEK_ILI9881C=y
+CONFIG_VIDEO_DW_DSI_LIGHT=y
+CONFIG_VIDEO_DW_DPHY=y
+CONFIG_VIDEO_DW_DSI_HOST=y
+CONFIG_SYS_WHITE_ON_BLACK=y
+CONFIG_PMIC_VOL_INIT=y
+CONFIG_DDR_REGU_0V6=600000
+CONFIG_DDR_REGU_0V8=800000
+CONFIG_DDR_REGU_1V1=1100000
+CONFIG_BOARD_RNG_SEED=y
+CONFIG_FIXUP_MEMORY_REGION=y
+CONFIG_MISC=y
+CONFIG_LIGHT_AON_CONF=y
--- a/configs/light_lpi4a_console_defconfig
+++ b/configs/light_lpi4a_console_defconfig
@@ -0,0 +1,113 @@
+CONFIG_RISCV=y
+CONFIG_SPL_MMC_SUPPORT=y
+CONFIG_ENV_SIZE=0x20000
+CONFIG_ENV_OFFSET=0xe0000
+CONFIG_NR_DRAM_BANKS=8
+CONFIG_SPL=y
+CONFIG_SMP=y
+CONFIG_TARGET_LIGHT_C910=y
+CONFIG_TARGET_LIGHT_FM_C910_LPI4A=y
+# CONFIG_THEAD_PLIC is not set
+# CONFIG_THEAD_LIGHT_TIMER is not set
+# CONFIG_THEAD_LIGHT_DIGITAL_SENSOR is not set
+CONFIG_ARCH_RV64I=y
+CONFIG_DISTRO_DEFAULTS=y
+CONFIG_BUILD_TARGET="u-boot-with-spl.bin"
+CONFIG_DISPLAY_CPUINFO=y
+CONFIG_DISPLAY_BOARDINFO=y
+# CONFIG_SPL_LEGACY_IMAGE_SUPPORT is not set
+CONFIG_SPL_RAM_SUPPORT=y
+CONFIG_SPL_RAM_DEVICE=y
+CONFIG_SYS_PROMPT="LicheeConsole4A # "
+CONFIG_DDR_LP4X_3733_DUALRANK=y
+# CONFIG_DDR_LP4_3733_DUALRANK is not set
+CONFIG_DDR_BOARD_CONFIG=y
+CONFIG_CMD_BOOT_SLAVE=y
+CONFIG_CMD_ERASEENV=y
+CONFIG_CMD_GPT=y
+CONFIG_CMD_MTD=y
+CONFIG_CMD_EXT4_WRITE=y
+CONFIG_CMD_SPI=y
+CONFIG_CMD_I2C=y
+CONFIG_CMD_MEMTEST=y
+CONFIG_DDR_SCAN=y
+CONFIG_DDR_PRBS_TEST=n
+# CONFIG_DOS_PARTITION is not set
+# CONFIG_ISO_PARTITION is not set
+CONFIG_PARTITION_TYPE_GUID=y
+CONFIG_OF_EMBED=y
+CONFIG_DEFAULT_DEVICE_TREE="light-lpi4a-laptop"
+CONFIG_ENV_IS_IN_MMC=y
+CONFIG_SYS_RELOC_GD_ENV_ADDR=y
+CONFIG_SPL_CLK=y
+CONFIG_USB_FUNCTION_FASTBOOT=y
+CONFIG_UDP_FUNCTION_FASTBOOT=y
+CONFIG_FASTBOOT_BUF_ADDR=0x10000000
+CONFIG_FASTBOOT_FLASH=y
+CONFIG_FASTBOOT_FLASH_MMC_DEV=0
+CONFIG_FASTBOOT_CMD_OEM_FORMAT=y
+CONFIG_DM_GPIO=y
+CONFIG_DM_I2C=y
+CONFIG_SYS_I2C_DW=y
+CONFIG_DWAPB_GPIO=y
+# CONFIG_MMC_SPI is not set
+CONFIG_MMC_VERBOSE=y
+CONFIG_SUPPORT_EMMC_BOOT=y
+CONFIG_MMC_IO_VOLTAGE=y
+CONFIG_MMC_UHS_SUPPORT=y
+CONFIG_MMC_HS400_SUPPORT=y
+CONFIG_MMC_DW=y
+CONFIG_MMC_DW_SNPS=y
+CONFIG_MMC_SDHCI=y
+CONFIG_MMC_SDHCI_SNPS=y
+CONFIG_MMC_SDHCI_SDMA=y
+CONFIG_CMD_MMC=y
+CONFIG_CMD_MMC_RPMB=y
+CONFIG_CMD_USB_MASS_STORAGE=y
+CONFIG_SUPPORT_EMMC_RPMB=y
+CONFIG_DM_MTD=y
+CONFIG_MTD_SPI_NAND=y
+CONFIG_SPI_FLASH_WINBOND=y
+CONFIG_ETH_DESIGNWARE=y
+CONFIG_PHY_REALTEK=y
+CONFIG_RTL8211E_PINE64_GIGABIT_FIX=y
+CONFIG_RTL8211X_PHY_FORCE_MASTER=y
+CONFIG_RTL8211F_PHY_FORCE_EEE_RXC_ON=y
+CONFIG_SYS_NS16550=y
+CONFIG_SPI=y
+CONFIG_DESIGNWARE_SPI=y
+CONFIG_DESIGNWARE_QSPI=y
+CONFIG_USB=y
+CONFIG_USB_DWC3=y
+CONFIG_USB_GADGET=y
+CONFIG_USB_GADGET_MANUFACTURER="U-Boot-THEAD"
+CONFIG_USB_GADGET_VENDOR_NUM=0x1234
+CONFIG_USB_GADGET_PRODUCT_NUM=0x8888
+CONFIG_USB_FUNCTION_MASS_STORAGE=y
+# CONFIG_SPL_USE_TINY_PRINTF is not set
+# CONFIG_EFI_LOADER is not set
+# CONFIG_LIGHT_SEC_BOOT is not set
+CONFIG_DEFAULT_FDT_FILE="thead/light-lpi4a-console.dtb"
+CONFIG_BOARD_LATE_INIT=y
+CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y
+CONFIG_DM_VIDEO=y
+CONFIG_PHY=y
+CONFIG_REGMAP=y
+CONFIG_SYSCON=y
+CONFIG_CMD_BMP=y
+CONFIG_VIDEO_BRIDGE=y
+CONFIG_DM_PCA953X=y
+CONFIG_VIDEO_VS_DPU=y
+CONFIG_VIDEO_LCD_ILITEK_ILI9881C=y
+CONFIG_VIDEO_DW_DSI_LIGHT=y
+CONFIG_VIDEO_DW_DPHY=y
+CONFIG_VIDEO_DW_DSI_HOST=y
+CONFIG_SYS_WHITE_ON_BLACK=y
+CONFIG_PMIC_VOL_INIT=y
+CONFIG_DDR_REGU_0V6=600000
+CONFIG_DDR_REGU_0V8=800000
+CONFIG_DDR_REGU_1V1=1100000
+CONFIG_BOARD_RNG_SEED=y
+CONFIG_FIXUP_MEMORY_REGION=y
+CONFIG_MISC=y
+CONFIG_LIGHT_AON_CONF=y
--- a/configs/light_lpi4a_defconfig
+++ b/configs/light_lpi4a_defconfig
@@ -18,7 +18,7 @@ CONFIG_DISPLAY_BOARDINFO=y
 # CONFIG_SPL_LEGACY_IMAGE_SUPPORT is not set
 CONFIG_SPL_RAM_SUPPORT=y
 CONFIG_SPL_RAM_DEVICE=y
-CONFIG_SYS_PROMPT="C910 Light# "
+CONFIG_SYS_PROMPT="Light LPI4A# "
 CONFIG_DDR_LP4X_3733_DUALRANK=y
 # CONFIG_DDR_LP4_3733_DUALRANK is not set
 CONFIG_DDR_BOARD_CONFIG=y
@@ -63,6 +63,7 @@ CONFIG_MMC_SDHCI_SNPS=y
 CONFIG_MMC_SDHCI_SDMA=y
 CONFIG_CMD_MMC=y
 CONFIG_CMD_MMC_RPMB=y
+CONFIG_CMD_USB_MASS_STORAGE=y
 CONFIG_SUPPORT_EMMC_RPMB=y
 CONFIG_DM_MTD=y
 CONFIG_MTD_SPI_NAND=y
@@ -85,9 +86,11 @@ CONFIG_USB_GADGET=y
 CONFIG_USB_GADGET_MANUFACTURER="U-Boot-THEAD"
 CONFIG_USB_GADGET_VENDOR_NUM=0x1234
 CONFIG_USB_GADGET_PRODUCT_NUM=0x8888
+CONFIG_USB_FUNCTION_MASS_STORAGE=y
 # CONFIG_SPL_USE_TINY_PRINTF is not set
 # CONFIG_EFI_LOADER is not set
 # CONFIG_LIGHT_SEC_BOOT is not set
+CONFIG_DEFAULT_FDT_FILE="thead/light-lpi4a.dtb"
 CONFIG_BOARD_LATE_INIT=y
 CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y
 CONFIG_DM_VIDEO=y
@@ -101,7 +104,7 @@ CONFIG_DM_PCA953X=y
 CONFIG_VIDEO_VS_DPU=y
 CONFIG_VIDEO_LCD_ILITEK_ILI9881C=n
 CONFIG_VIDEO_LCD_JD9365DA=y
-CONFIG_VIDEO_LCD_CUSTOM_LOGO=y
+#CONFIG_VIDEO_LCD_CUSTOM_LOGO=y
 CONFIG_VIDEO_DW_DSI_LIGHT=y
 CONFIG_VIDEO_DW_DPHY=y
 CONFIG_VIDEO_DW_DSI_HOST=y
@@ -110,6 +113,6 @@ CONFIG_PMIC_VOL_INIT=y
 CONFIG_DDR_REGU_0V6=600000
 CONFIG_DDR_REGU_0V8=800000
 CONFIG_DDR_REGU_1V1=1100000
+CONFIG_BOARD_RNG_SEED=y
 CONFIG_MISC=y
 CONFIG_LIGHT_AON_CONF=y
-
--- a/configs/light_lpi4a_sec_defconfig
+++ b/configs/light_lpi4a_sec_defconfig
@@ -102,7 +102,7 @@ CONFIG_DM_PCA953X=y
 CONFIG_VIDEO_VS_DPU=y
 CONFIG_VIDEO_LCD_ILITEK_ILI9881C=n
 CONFIG_VIDEO_LCD_JD9365DA=y
-CONFIG_VIDEO_LCD_CUSTOM_LOGO=y
+#CONFIG_VIDEO_LCD_CUSTOM_LOGO=y
 CONFIG_VIDEO_DW_DSI_LIGHT=y
 CONFIG_VIDEO_DW_DPHY=y
 CONFIG_VIDEO_DW_DSI_HOST=y
@@ -113,5 +113,3 @@ CONFIG_DDR_REGU_0V8=800000
 CONFIG_DDR_REGU_1V1=1100000
 CONFIG_MISC=y
 CONFIG_LIGHT_AON_CONF=y
-# CONFIG_FASTBOOT_CMD_OEM_NV_OPERATION is not set
-# CONFIG_FASTBOOT_ECIES_AUTH is not set
--- a/configs/light_milkv_meles_defconfig
+++ b/configs/light_milkv_meles_defconfig
@@ -0,0 +1,89 @@
+CONFIG_RISCV=y
+CONFIG_SPL_MMC_SUPPORT=y
+CONFIG_ENV_SIZE=0x20000
+CONFIG_ENV_OFFSET=0xe0000
+CONFIG_NR_DRAM_BANKS=8
+CONFIG_SPL=y
+CONFIG_SMP=y
+CONFIG_TARGET_LIGHT_C910=y
+CONFIG_PMIC_VOL_INIT=y
+CONFIG_TARGET_LIGHT_FM_C910_MILKV_MELES=y
+CONFIG_DDR_LP4X_3733_SINGLERANK=y
+CONFIG_DDR_BOARD_CONFIG=y
+CONFIG_ARCH_RV64I=y
+CONFIG_DISTRO_DEFAULTS=y
+CONFIG_BUILD_TARGET="u-boot-with-spl.bin"
+CONFIG_DEFAULT_FDT_FILE="thead/th1520-milkv-meles.dtb"
+CONFIG_BOARD_LATE_INIT=y
+CONFIG_DISPLAY_CPUINFO=y
+CONFIG_DISPLAY_BOARDINFO=y
+# CONFIG_SPL_LEGACY_IMAGE_SUPPORT is not set
+CONFIG_SPL_RAM_SUPPORT=y
+CONFIG_SPL_RAM_DEVICE=y
+CONFIG_SYS_PROMPT="Milk-V Meles# "
+CONFIG_CMD_BOOT_SLAVE=y
+CONFIG_CMD_ERASEENV=y
+CONFIG_CMD_MEMTEST=y
+CONFIG_DDR_SCAN=y
+CONFIG_CMD_GPT=y
+CONFIG_CMD_I2C=y
+CONFIG_CMD_MTD=y
+CONFIG_CMD_SPI=y
+CONFIG_CMD_USB_MASS_STORAGE=y
+CONFIG_CMD_EXT4_WRITE=y
+# CONFIG_DOS_PARTITION is not set
+# CONFIG_ISO_PARTITION is not set
+CONFIG_PARTITION_TYPE_GUID=y
+CONFIG_OF_EMBED=y
+CONFIG_DEFAULT_DEVICE_TREE="light-milkv-meles"
+CONFIG_ENV_IS_IN_MMC=y
+CONFIG_SYS_RELOC_GD_ENV_ADDR=y
+CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y
+CONFIG_REGMAP=y
+CONFIG_SYSCON=y
+CONFIG_SPL_CLK=y
+CONFIG_USB_FUNCTION_FASTBOOT=y
+CONFIG_UDP_FUNCTION_FASTBOOT=y
+CONFIG_FASTBOOT_BUF_ADDR=0x10000000
+CONFIG_FASTBOOT_FLASH=y
+CONFIG_FASTBOOT_FLASH_MMC_DEV=0
+CONFIG_FASTBOOT_CMD_OEM_FORMAT=y
+CONFIG_DM_GPIO=y
+CONFIG_DWAPB_GPIO=y
+CONFIG_DM_PCA953X=y
+CONFIG_DM_I2C=y
+CONFIG_SYS_I2C_DW=y
+# CONFIG_MMC_SPI is not set
+CONFIG_SUPPORT_EMMC_RPMB=y
+CONFIG_SUPPORT_EMMC_BOOT=y
+CONFIG_MMC_IO_VOLTAGE=y
+CONFIG_MMC_UHS_SUPPORT=y
+CONFIG_MMC_HS400_SUPPORT=y
+CONFIG_MMC_DW=y
+CONFIG_MMC_DW_SNPS=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_WINBOND=y
+CONFIG_PHY_REALTEK=y
+CONFIG_RTL8211E_PINE64_GIGABIT_FIX=y
+CONFIG_RTL8211X_PHY_FORCE_MASTER=y
+CONFIG_RTL8211F_PHY_FORCE_EEE_RXC_ON=y
+CONFIG_ETH_DESIGNWARE=y
+CONFIG_PHY=y
+CONFIG_SYS_NS16550=y
+CONFIG_SPI=y
+CONFIG_DESIGNWARE_SPI=y
+CONFIG_DESIGNWARE_QSPI=y
+CONFIG_USB=y
+CONFIG_USB_DWC3=y
+CONFIG_USB_GADGET=y
+CONFIG_USB_GADGET_MANUFACTURER="U-Boot-THEAD"
+CONFIG_USB_GADGET_VENDOR_NUM=0x1234
+CONFIG_USB_GADGET_PRODUCT_NUM=0x8888
+CONFIG_SYS_WHITE_ON_BLACK=y
+# CONFIG_SPL_USE_TINY_PRINTF is not set
+CONFIG_OF_LIBFDT_OVERLAY=y
+# CONFIG_EFI_LOADER is not set
--- a/configs/light_milkv_meles_dualrank_defconfig
+++ b/configs/light_milkv_meles_dualrank_defconfig
@@ -0,0 +1,93 @@
+CONFIG_RISCV=y
+CONFIG_SPL_MMC_SUPPORT=y
+CONFIG_ENV_SIZE=0x20000
+CONFIG_ENV_OFFSET=0xe0000
+CONFIG_NR_DRAM_BANKS=8
+CONFIG_SPL=y
+CONFIG_SMP=y
+CONFIG_TARGET_LIGHT_C910=y
+CONFIG_PMIC_VOL_INIT=y
+CONFIG_TARGET_LIGHT_FM_C910_MILKV_MELES=y
+CONFIG_DDR_LP4X_3733_DUALRANK=y
+CONFIG_DDR_BOARD_CONFIG=y
+CONFIG_ARCH_RV64I=y
+CONFIG_DISTRO_DEFAULTS=y
+CONFIG_BUILD_TARGET="u-boot-with-spl.bin"
+CONFIG_DEFAULT_FDT_FILE="thead/th1520-milkv-meles.dtb"
+CONFIG_BOARD_LATE_INIT=y
+CONFIG_DISPLAY_CPUINFO=y
+CONFIG_DISPLAY_BOARDINFO=y
+# CONFIG_SPL_LEGACY_IMAGE_SUPPORT is not set
+CONFIG_SPL_RAM_SUPPORT=y
+CONFIG_SPL_RAM_DEVICE=y
+CONFIG_SYS_PROMPT="Milk-V Meles# "
+CONFIG_CMD_BOOT_SLAVE=y
+CONFIG_CMD_ERASEENV=y
+CONFIG_CMD_MEMTEST=y
+CONFIG_DDR_SCAN=y
+CONFIG_CMD_GPT=y
+CONFIG_CMD_I2C=y
+CONFIG_CMD_MTD=y
+CONFIG_CMD_SPI=y
+CONFIG_CMD_USB_MASS_STORAGE=y
+CONFIG_CMD_EXT4_WRITE=y
+# CONFIG_DOS_PARTITION is not set
+# CONFIG_ISO_PARTITION is not set
+CONFIG_PARTITION_TYPE_GUID=y
+CONFIG_OF_EMBED=y
+CONFIG_DEFAULT_DEVICE_TREE="light-milkv-meles"
+CONFIG_ENV_IS_IN_MMC=y
+CONFIG_SYS_RELOC_GD_ENV_ADDR=y
+CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y
+CONFIG_REGMAP=y
+CONFIG_SYSCON=y
+CONFIG_SPL_CLK=y
+CONFIG_USB_FUNCTION_FASTBOOT=y
+CONFIG_UDP_FUNCTION_FASTBOOT=y
+CONFIG_FASTBOOT_BUF_ADDR=0x10000000
+CONFIG_FASTBOOT_FLASH=y
+CONFIG_FASTBOOT_FLASH_MMC_DEV=0
+CONFIG_FASTBOOT_CMD_OEM_FORMAT=y
+CONFIG_DM_GPIO=y
+CONFIG_DWAPB_GPIO=y
+CONFIG_DM_PCA953X=y
+CONFIG_DM_I2C=y
+CONFIG_SYS_I2C_DW=y
+# CONFIG_MMC_SPI is not set
+CONFIG_SUPPORT_EMMC_RPMB=y
+CONFIG_SUPPORT_EMMC_BOOT=y
+CONFIG_MMC_IO_VOLTAGE=y
+CONFIG_MMC_UHS_SUPPORT=y
+CONFIG_MMC_HS400_SUPPORT=y
+CONFIG_MMC_DW=y
+CONFIG_MMC_DW_SNPS=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_WINBOND=y
+CONFIG_PHY_REALTEK=y
+CONFIG_RTL8211E_PINE64_GIGABIT_FIX=y
+CONFIG_RTL8211X_PHY_FORCE_MASTER=y
+CONFIG_RTL8211F_PHY_FORCE_EEE_RXC_ON=y
+CONFIG_ETH_DESIGNWARE=y
+CONFIG_PHY=y
+CONFIG_SYS_NS16550=y
+CONFIG_SPI=y
+CONFIG_DESIGNWARE_SPI=y
+CONFIG_DESIGNWARE_QSPI=y
+CONFIG_USB=y
+CONFIG_USB_DWC3=y
+CONFIG_USB_GADGET=y
+CONFIG_USB_GADGET_MANUFACTURER="U-Boot-THEAD"
+CONFIG_USB_GADGET_VENDOR_NUM=0x1234
+CONFIG_USB_GADGET_PRODUCT_NUM=0x8888
+CONFIG_SYS_WHITE_ON_BLACK=y
+# CONFIG_SPL_USE_TINY_PRINTF is not set
+CONFIG_OF_LIBFDT_OVERLAY=y
+# CONFIG_EFI_LOADER is not set
+CONFIG_BOARD_RNG_SEED=y
+CONFIG_FIXUP_MEMORY_REGION=y
+CONFIG_MISC=y
+CONFIG_LIGHT_AON_CONF=y
--- a/configs/light_milkv_meles_singlerank_defconfig
+++ b/configs/light_milkv_meles_singlerank_defconfig
@@ -0,0 +1,93 @@
+CONFIG_RISCV=y
+CONFIG_SPL_MMC_SUPPORT=y
+CONFIG_ENV_SIZE=0x20000
+CONFIG_ENV_OFFSET=0xe0000
+CONFIG_NR_DRAM_BANKS=8
+CONFIG_SPL=y
+CONFIG_SMP=y
+CONFIG_TARGET_LIGHT_C910=y
+CONFIG_PMIC_VOL_INIT=y
+CONFIG_TARGET_LIGHT_FM_C910_MILKV_MELES=y
+CONFIG_DDR_LP4X_3733_SINGLERANK=y
+CONFIG_DDR_BOARD_CONFIG=y
+CONFIG_ARCH_RV64I=y
+CONFIG_DISTRO_DEFAULTS=y
+CONFIG_BUILD_TARGET="u-boot-with-spl.bin"
+CONFIG_DEFAULT_FDT_FILE="thead/th1520-milkv-meles-4g.dtb"
+CONFIG_BOARD_LATE_INIT=y
+CONFIG_DISPLAY_CPUINFO=y
+CONFIG_DISPLAY_BOARDINFO=y
+# CONFIG_SPL_LEGACY_IMAGE_SUPPORT is not set
+CONFIG_SPL_RAM_SUPPORT=y
+CONFIG_SPL_RAM_DEVICE=y
+CONFIG_SYS_PROMPT="Milk-V Meles 4G# "
+CONFIG_CMD_BOOT_SLAVE=y
+CONFIG_CMD_ERASEENV=y
+CONFIG_CMD_MEMTEST=y
+CONFIG_DDR_SCAN=y
+CONFIG_CMD_GPT=y
+CONFIG_CMD_I2C=y
+CONFIG_CMD_MTD=y
+CONFIG_CMD_SPI=y
+CONFIG_CMD_USB_MASS_STORAGE=y
+CONFIG_CMD_EXT4_WRITE=y
+# CONFIG_DOS_PARTITION is not set
+# CONFIG_ISO_PARTITION is not set
+CONFIG_PARTITION_TYPE_GUID=y
+CONFIG_OF_EMBED=y
+CONFIG_DEFAULT_DEVICE_TREE="light-milkv-meles"
+CONFIG_ENV_IS_IN_MMC=y
+CONFIG_SYS_RELOC_GD_ENV_ADDR=y
+CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y
+CONFIG_REGMAP=y
+CONFIG_SYSCON=y
+CONFIG_SPL_CLK=y
+CONFIG_USB_FUNCTION_FASTBOOT=y
+CONFIG_UDP_FUNCTION_FASTBOOT=y
+CONFIG_FASTBOOT_BUF_ADDR=0x10000000
+CONFIG_FASTBOOT_FLASH=y
+CONFIG_FASTBOOT_FLASH_MMC_DEV=0
+CONFIG_FASTBOOT_CMD_OEM_FORMAT=y
+CONFIG_DM_GPIO=y
+CONFIG_DWAPB_GPIO=y
+CONFIG_DM_PCA953X=y
+CONFIG_DM_I2C=y
+CONFIG_SYS_I2C_DW=y
+# CONFIG_MMC_SPI is not set
+CONFIG_SUPPORT_EMMC_RPMB=y
+CONFIG_SUPPORT_EMMC_BOOT=y
+CONFIG_MMC_IO_VOLTAGE=y
+CONFIG_MMC_UHS_SUPPORT=y
+CONFIG_MMC_HS400_SUPPORT=y
+CONFIG_MMC_DW=y
+CONFIG_MMC_DW_SNPS=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_WINBOND=y
+CONFIG_PHY_REALTEK=y
+CONFIG_RTL8211E_PINE64_GIGABIT_FIX=y
+CONFIG_RTL8211X_PHY_FORCE_MASTER=y
+CONFIG_RTL8211F_PHY_FORCE_EEE_RXC_ON=y
+CONFIG_ETH_DESIGNWARE=y
+CONFIG_PHY=y
+CONFIG_SYS_NS16550=y
+CONFIG_SPI=y
+CONFIG_DESIGNWARE_SPI=y
+CONFIG_DESIGNWARE_QSPI=y
+CONFIG_USB=y
+CONFIG_USB_DWC3=y
+CONFIG_USB_GADGET=y
+CONFIG_USB_GADGET_MANUFACTURER="U-Boot-THEAD"
+CONFIG_USB_GADGET_VENDOR_NUM=0x1234
+CONFIG_USB_GADGET_PRODUCT_NUM=0x8888
+CONFIG_SYS_WHITE_ON_BLACK=y
+# CONFIG_SPL_USE_TINY_PRINTF is not set
+CONFIG_OF_LIBFDT_OVERLAY=y
+# CONFIG_EFI_LOADER is not set
+CONFIG_BOARD_RNG_SEED=y
+CONFIG_FIXUP_MEMORY_REGION=y
+CONFIG_MISC=y
+CONFIG_LIGHT_AON_CONF=y
--- a/configs/tools-only_defconfig
+++ b/configs/tools-only_defconfig
@@ -6,6 +6,7 @@ CONFIG_FIT_SIGNATURE=y
 # CONFIG_CMD_BOOTD is not set
 # CONFIG_CMD_BOOTM is not set
 # CONFIG_CMD_ELF is not set
+# CONFIG_CMD_EXTENSION is not set
 # CONFIG_CMD_DATE is not set
 CONFIG_OF_CONTROL=y
 CONFIG_OF_HOSTFILE=y
--- a/doc/README.pxe
+++ b/doc/README.pxe
@@ -89,6 +89,9 @@ pxe boot
     fdt_addr - the location of a fdt blob. 'fdt_addr' will be passed to bootm
     command if it is set and 'fdt_addr_r' is not passed to bootm command.

+     fdtoverlay_addr_r - location in RAM at which 'pxe boot' will temporarily store
+     fdt overlay(s) before applying them to the fdt blob stored at 'fdt_addr_r'.
+
 pxe file format
 ===============
 The pxe file format is nearly a subset of the PXELINUX file format; see
@@ -148,6 +151,12 @@ kernel <path>	    - if this label is chosen, use tftp to retrieve the kernel
 		      It useful for overlay selection in pxe file
 		      (see: doc/uImage.FIT/overlay-fdt-boot.txt)

+fdtoverlays <path> [...] - if this label is chosen, use tftp to retrieve the DT
+                      overlay(s) at <path>. it will be temporarily stored at the
+                      address indicated in the fdtoverlay_addr_r environment variable,
+                      and then applied in the load order to the fdt blob stored at the
+                      address indicated in the fdt_addr_r environment variable.
+
 append <string>	    - use <string> as the kernel command line when booting this
 		      label.

--- a/doc/usage/extension.rst
+++ b/doc/usage/extension.rst
@@ -0,0 +1,111 @@
+.. SPDX-License-Identifier: GPL-2.0+
+.. Copyright 2021, Kory Maincent <kory.maincent@bootlin.com>
+
+U-Boot extension board usage (CONFIG_EXTENSION)
+===============================================
+
+Synopsis
+--------
+
+::
+
+    extension scan
+    extension list
+    extension apply <extension number|all>
+
+Description
+-----------
+
+The "extension" command proposes a generic U-Boot mechanism to detect
+extension boards connected to the HW platform, and apply the appropriate
+Device Tree overlays depending on the detected extension boards.
+
+The "extension" command comes with three sub-commands:
+
+ - "extension scan" makes the generic code call the board-specific
+   extension_board_scan() function to retrieve the list of detected
+   extension boards.
+
+ - "extension list" allows to list the detected extension boards.
+
+ - "extension apply <number>|all" allows to apply the Device Tree
+   overlay(s) corresponding to one, or all, extension boards
+
+The latter requires two environment variables to exist:
+
+ - extension_overlay_addr: the RAM address where to load the Device
+   Tree overlays
+
+ - extension_overlay_cmd: the U-Boot command to load one overlay.
+   Indeed, the location and mechanism to load DT overlays is very setup
+   specific.
+
+In order to enable this mechanism, board-specific code must implement
+the extension_board_scan() function that fills in a linked list of
+"struct extension", each describing one extension board. In addition,
+the board-specific code must select the SUPPORT_EXTENSION_SCAN Kconfig
+boolean.
+
+Usage example
+-------------
+
+1. Make sure your devicetree is loaded and set as the working fdt tree.
+
+::
+
+    => run loadfdt
+    => fdt addr $fdtaddr
+
+2. Prepare the environment variables
+
+::
+
+    => setenv extension_overlay_addr 0x88080000
+    => setenv extension_overlay_cmd 'load mmc 0:1 ${extension_overlay_addr} /boot/${extension_overlay_name}'
+
+3. Detect the plugged extension board
+
+::
+
+    => extension scan
+
+4. List the plugged extension board information and the devicetree
+   overlay name
+
+::
+
+    => extension list
+
+5. Apply the appropriate devicetree overlay
+
+For apply the selected overlay:
+
+::
+
+    => extension apply 0
+
+For apply all the overlays:
+
+::
+
+    => extension apply all
+
+Simple extension_board_scan function example
+--------------------------------------------
+
+.. code-block:: c
+
+    int extension_board_scan(struct list_head *extension_list)
+    {
+        struct extension *extension;
+
+        extension = calloc(1, sizeof(struct extension));
+        snprintf(extension->overlay, sizeof(extension->overlay), "overlay.dtbo");
+        snprintf(extension->name, sizeof(extension->name), "extension board");
+        snprintf(extension->owner, sizeof(extension->owner), "sandbox");
+        snprintf(extension->version, sizeof(extension->version), "1.1");
+        snprintf(extension->other, sizeof(extension->other), "Extension board information");
+        list_add_tail(&extension->list, extension_list);
+
+        return 1;
+    }
--- a/drivers/Makefile
+++ b/drivers/Makefile
@@ -85,9 +85,7 @@ obj-y += misc/
 obj-$(CONFIG_MMC) += mmc/
 obj-$(CONFIG_NVME) += nvme/
 obj-$(CONFIG_PCI_ENDPOINT) += pci_endpoint/
-ifdef CONFIG_RV_BOOK
 obj-$(CONFIG_DM_POWER_DELIVERY) += power/power_delivery/
-endif
 obj-y += dfu/
 obj-$(CONFIG_PCH) += pch/
 obj-y += phy/allwinner/
--- a/drivers/fastboot/Kconfig
+++ b/drivers/fastboot/Kconfig
@@ -135,14 +135,6 @@ config FASTBOOT_CMD_OEM_FORMAT
 	  relies on the env variable partitions to contain the list of
 	  partitions as required by the gpt command.

-config FASTBOOT_CMD_OEM_NV_OPERATION
-	bool "Enable the 'oem nv get/set' command"
-	help
-	  Add support for the "oem get/set" command from a client.
-
-config FASTBOOT_ECIES_AUTH
-	bool "Enabled ecies fastboot auth"
-
 endif # FASTBOOT

 endmenu
--- a/drivers/fastboot/Makefile
+++ b/drivers/fastboot/Makefile
@@ -3,7 +3,5 @@
 obj-y += fb_common.o
 obj-y += fb_getvar.o
 obj-y += fb_command.o
-obj-$(CONFIG_FASTBOOT_ECIES_AUTH) += fb_ecies.o
 obj-$(CONFIG_FASTBOOT_FLASH_MMC) += fb_mmc.o
 obj-$(CONFIG_FASTBOOT_FLASH_NAND) += fb_nand.o
-obj-$(CONFIG_FASTBOOT_CMD_OEM_NV_OPERATION) += fb_nv_operation.o
--- a/drivers/fastboot/fb_command.c
+++ b/drivers/fastboot/fb_command.c
@@ -45,19 +45,6 @@ static void oem_format(char *, char *);
 static void oem_command(char *, char *);
 int image_have_head(unsigned long img_src_addr);

-#if CONFIG_FASTBOOT_CMD_OEM_NV_OPERATION
-void oem_nv_get_proccess(char *cmd_parameter, char *response);
-void oem_nv_set_proccess(char *cmd_parameter, char *response);
-void oem_nv_factory_recovery_process(char *cmd_parameter, char *response);
-static void oem_nv_get(char *cmd_parameter, char *response);
-static void oem_nv_set(char *cmd_parameter, char *response);
-static void oem_fcty(char *cmd_parameter, char *response);
-#endif
-
-#ifdef CONFIG_FASTBOOT_ECIES_AUTH
-int ecies_process_data(uint8_t * data, int data_size,char *response);
-#endif
-
 static const struct {
 	const char *command;
 	void (*dispatch)(char *cmd_parameter, char *response);
@@ -110,20 +97,6 @@ static const struct {
 		.command = "oem command",
 		.dispatch = oem_command,
 	},
-#if CONFIG_FASTBOOT_CMD_OEM_NV_OPERATION
-	[FASTBOOT_COMMAND_OEM_NV_GET] = {
-		.command = "oem nv get",
-		.dispatch = oem_nv_get,
-	},
-	[FASTBOOT_COMMAND_OEM_NV_SET] = {
-		.command = "oem nv set",
-		.dispatch = oem_nv_set,
-	},
-	[FASTBOOT_COMMAND_OEM_FCTY] = {
-		.command = "oem fcty",
-		.dispatch = oem_fcty,
-	},
-#endif
 };

 /**
@@ -321,90 +294,7 @@ int check_image_board_id(uint8_t *image_data)
 	return 0;
 }

-int hibernate_image_cleaned_flag = 0;
-void clean_hibernate_image_header(char *response)
-{
-	struct blk_desc *dev_desc;
-	disk_partition_t info;
-	if(0x03 == hibernate_image_cleaned_flag) //already erased all
-	{
-		return;
-	}
-	dev_desc = blk_get_dev("mmc", CONFIG_FASTBOOT_FLASH_MMC_DEV);
-	if (!dev_desc || dev_desc->type == DEV_TYPE_UNKNOWN) {
-		fastboot_fail("invalid mmc device", response);
-		return;
-	}
-	char * buf = memalign(CONFIG_SYS_CACHELINE_SIZE,4096);
-	if(!buf) {
-		printf(" mem alloc for hibernate partition header failed!\n");
-		return;
-	}
-	/* if fastresume partition exists, earse the old image header */
-	if(part_get_info_by_name(dev_desc, "fastresume", &info)) {
-		printf(" find fastresume partition , erase the header:\n");
-		memset(buf,0xff,4096);
-		if(blk_dwrite(dev_desc, info.start, 4096/info.blksz, buf) != 4096/info.blksz)
-		{
-			printf(" fastresume header write failed!\n");
-			hibernate_image_cleaned_flag = 0;
-		}
-		else
-		{
-			hibernate_image_cleaned_flag |= 0x1;
-		}
-	}
-	/* if swap partition exists, earse the old image header */
-	if(part_get_info_by_name(dev_desc, "swap", &info)) {
-		printf(" find swap partition , erase the header:\n");
-		memset(buf,0xff,4096);
-		if(blk_dwrite(dev_desc, info.start, 4096/info.blksz, buf) != 4096/info.blksz)
-		{
-			printf(" swap header write failed!\n");
-			hibernate_image_cleaned_flag = 0;
-		}
-		else
-		{
-			hibernate_image_cleaned_flag |= 0x2;
-		}
-	}
-	free(buf);
-}
-
 #if CONFIG_IS_ENABLED(FASTBOOT_FLASH)
-void fasboot_uboot_write_process(void *buf, char *response)
-{
-	char cmdbuf[32];
-	u32 block_cnt;
-	struct blk_desc *dev_desc;
-	int ret = 0;
-	disk_partition_t info;
-
-	ret = check_image_board_id(buf);
-	if (ret != 0) {
-		fastboot_fail("U-BOOT image does not match the type of BOARD", response);
-		return;
-	}
-
-	dev_desc = blk_get_dev("mmc", CONFIG_FASTBOOT_FLASH_MMC_DEV);
-	if (!dev_desc || dev_desc->type == DEV_TYPE_UNKNOWN) {
-		fastboot_fail("invalid mmc device", response);
-		return;
-	}
-
-	run_command("mmc partconf 0 1 0 1", 0);
-
-	block_cnt = image_size / BLOCK_SIZE;
-	if (image_size % BLOCK_SIZE) {
-		block_cnt = block_cnt +1;
-	}
-
-	sprintf(cmdbuf, "mmc write 0x%p 0 %x", buf, block_cnt);
-
-	run_command(cmdbuf, 0);
-	run_command("mmc partconf 0 1 0 0", 0);
-}
-
 /**
 * flash() - write the downloaded image to the indicated partition.
 *
@@ -418,10 +308,36 @@ static void flash(char *cmd_parameter, char *response)
 {
 #ifdef THEAD_LIGHT_FASTBOOT
 	char cmdbuf[32];
+	u32 block_cnt;
 	struct blk_desc *dev_desc;
 	disk_partition_t info;
+	int ret = 0;
+
 	if (strcmp(cmd_parameter, "uboot") == 0) {
-		fasboot_uboot_write_process(fastboot_buf_addr, response);
+		ret = check_image_board_id(fastboot_buf_addr);
+		if (ret != 0) {
+			fastboot_fail("U-BOOT image does not match the type of BOARD", response);
+			return;
+		}
+
+		dev_desc = blk_get_dev("mmc", CONFIG_FASTBOOT_FLASH_MMC_DEV);
+		if (!dev_desc || dev_desc->type == DEV_TYPE_UNKNOWN) {
+			fastboot_fail("invalid mmc device", response);
+			return;
+        }
+
+		run_command("mmc partconf 0 1 0 1", 0);
+
+		block_cnt = image_size / BLOCK_SIZE;
+		if (image_size % BLOCK_SIZE) {
+			block_cnt = block_cnt +1;
+		}
+
+		sprintf(cmdbuf, "mmc write 0x%p 0 %x", fastboot_buf_addr, block_cnt);
+
+		run_command(cmdbuf, 0);
+		run_command("mmc partconf 0 1 0 0", 0);
+
 	} else if ((strcmp(cmd_parameter, "fw") == 0)) {
 		memcpy((void *)LIGHT_FW_ADDR, fastboot_buf_addr, image_size);
 	} else if ((strcmp(cmd_parameter, "uImage") == 0)) {
@@ -436,15 +352,13 @@ static void flash(char *cmd_parameter, char *response)
 		memcpy((void *)LIGHT_TF_FW_ADDR, fastboot_buf_addr, image_size);
 	} else if ((strcmp(cmd_parameter, TEE_PART_NAME) == 0)) {
 		memcpy((void *)LIGHT_TEE_FW_ADDR, fastboot_buf_addr, image_size);
-	}
-#ifdef CONFIG_RV_BOOK
-	else if ((strcmp(cmd_parameter, "boot") == 0)) {
+	} else if ((strcmp(cmd_parameter, "boot") == 0)) {
 		dev_desc = blk_get_dev("mmc", CONFIG_FASTBOOT_FLASH_MMC_DEV);
 		if (!dev_desc || dev_desc->type == DEV_TYPE_UNKNOWN) {
-				fastboot_fail("invalid mmc device", response);
-				return;
-		}
-				/* if fastresume partition exists, earse the old image header */
+			fastboot_fail("invalid mmc device", response);
+			return;
+        }
+		/* if fastresume partition exists, earse the old image header */
 		if(part_get_info_by_name(dev_desc, "fastresume", &info)) {
 			printf(" find fastresume partition , erase the header:\n");
 			char * buf = memalign(CONFIG_SYS_CACHELINE_SIZE,4096);
@@ -457,22 +371,6 @@ static void flash(char *cmd_parameter, char *response)
 			free(buf);
 		}
 	}
-#endif
-#ifdef CONFIG_FASTBOOT_ECIES_AUTH
-	else if ((strcmp(cmd_parameter, "ecies") == 0)) {
-		ecies_process_data(fastboot_buf_addr, image_size,response);
-		return;
-	}
-#endif
-
-	//If version is updated, hibernate image may not compatible with current,erase it.
-	if ((strcmp(cmd_parameter, "boot") == 0)
-		|| (strcmp(cmd_parameter, "uboot") == 0)
-		|| (strcmp(cmd_parameter, "root") == 0)) {
-
-		clean_hibernate_image_header(response);
-	}
-
 	if(strcmp(cmd_parameter, "uboot") == 0 || (strcmp(cmd_parameter, "fw") == 0) ||
 	   (strcmp(cmd_parameter, "uImage") == 0) || (strcmp(cmd_parameter, "dtb") == 0) ||
 	   (strcmp(cmd_parameter, "rootfs") == 0) || (strcmp(cmd_parameter, "aon") == 0)) {
@@ -482,7 +380,54 @@ static void flash(char *cmd_parameter, char *response)
 #endif

 #if CONFIG_IS_ENABLED(LIGHT_SEC_UPGRADE)
-	if (strcmp(cmd_parameter, UBOOT_IMG_UPD_NAME) == 0) {
+	if(strcmp(cmd_parameter, TF_IMG_UPD_NAME) == 0) {
+		#if CONFIG_IS_ENABLED(FASTBOOT_FLASH_MMC)
+		/* tee/tf/uboot image must be written into stash partition */
+		sprintf(cmdbuf, "%s", STASH_PART_NAME);
+		fastboot_mmc_flash_write(cmdbuf, fastboot_buf_addr, image_size, response);
+		#endif
+		/* Send ACK to host */
+		fastboot_okay(NULL, response);
+
+		/* set secure upgrade flag to indicate it is TF image upgrade*/
+		sprintf(cmdbuf,"env set sec_upgrade_mode 0x%x", TF_SEC_UPGRADE_FLAG);
+		run_command(cmdbuf, 0);
+		run_command("saveenv", 0);
+		run_command("reset", 0);
+		return;
+	} else if (strcmp(cmd_parameter, TEE_IMG_UPD_NAME) == 0) {
+		#if CONFIG_IS_ENABLED(FASTBOOT_FLASH_MMC)
+		/* tee/tf/uboot image must be written into stash partition */
+		sprintf(cmdbuf, "%s", STASH_PART_NAME);
+		fastboot_mmc_flash_write(cmdbuf, fastboot_buf_addr, image_size, response);
+		#endif
+
+		/* Send ACK to host */
+		fastboot_okay(NULL, response);
+
+		/* set secure upgrade flag to indicate it is TEE image upgrade*/
+		sprintf(cmdbuf,"env set sec_upgrade_mode 0x%x", TEE_SEC_UPGRADE_FLAG);
+		run_command(cmdbuf, 0);
+		run_command("saveenv", 0);
+		run_command("reset", 0);
+		return;
+	} else if (strcmp(cmd_parameter, SBMETA_IMG_UPD_NAME) == 0) {
+		#if CONFIG_IS_ENABLED(FASTBOOT_FLASH_MMC)
+		/* tee/tf/uboot image must be written into stash partition */
+		sprintf(cmdbuf, "%s", STASH_PART_NAME);
+		fastboot_mmc_flash_write(cmdbuf, fastboot_buf_addr, image_size, response);
+		#endif
+
+		/* Send ACK to host */
+		fastboot_okay(NULL, response);
+
+		/* set secure upgrade flag to indicate it is TEE image upgrade*/
+		sprintf(cmdbuf,"env set sec_upgrade_mode 0x%x", SBMETA_SEC_UPGRADE_FLAG);
+		run_command(cmdbuf, 0);
+		run_command("saveenv", 0);
+		run_command("reset", 0);
+		return;
+	} else if (strcmp(cmd_parameter, UBOOT_IMG_UPD_NAME) == 0) {
 		#if CONFIG_IS_ENABLED(FASTBOOT_FLASH_MMC)

 		env_set_hex("ubootupdsize", image_size);
@@ -585,38 +530,3 @@ static void oem_command(char *cmd_parameter, char *response)
 	else
 		fastboot_okay(NULL, response);
 }
-
-#if CONFIG_FASTBOOT_CMD_OEM_NV_OPERATION
-/**
- * oem_nv_get() - Execute the OEM NV GET command
- *
- * @cmd_parameter: Pointer to command parameter
- * @response: Pointer to fastboot response buffer
- */
- static void oem_nv_get(char *cmd_parameter, char *response)
- {
-	oem_nv_get_proccess(cmd_parameter,response);
- }
-
-/**
- * oem_nv_set() - Execute the OEM NV Set command
- *
- * @cmd_parameter: Pointer to command parameter
- * @response: Pointer to fastboot response buffer
- */
- static void oem_nv_set(char *cmd_parameter, char *response)
- {
-	oem_nv_set_proccess(cmd_parameter,response);
- }
-
-/**
- * oem_fcty() - Execute the OEM fcty command
- *
- * @cmd_parameter: Pointer to command parameter
- * @response: Pointer to fastboot response buffer
- */
- static void oem_fcty(char *cmd_parameter, char *response)
- {
-	oem_nv_factory_recovery_process(cmd_parameter,response);
- }
- #endif
--- a/drivers/fastboot/fb_ecies.c
+++ b/drivers/fastboot/fb_ecies.c
@@ -1,198 +0,0 @@
-#include <sec_ecies_session.h>
-#include <common.h>
-#include <command.h>
-#include <env.h>
-#include <fastboot.h>
-#include <fastboot-internal.h>
-#include <fb_mmc.h>
-#include <fb_nand.h>
-#include <part.h>
-#include <stdlib.h>
-#include <csi_sec_img_verify.h>
-
-#if CONFIG_IS_ENABLED(FASTBOOT_FLASH)
-extern void fasboot_uboot_write_process(void *buf, char *response);
-#define MAX_ECIES_IMAGE_SIZE (9*1024*1024)
-#define ECIES_MALLOC_START (MAX_ECIES_IMAGE_SIZE * 2)
-
-typedef struct {
-	uint32_t magic;
-	uint32_t file_size;
-	char partition_name[64];
-} __attribute__((__packed__)) send_file_info_t;
-
-static uint32_t ecies_file_pos = 0;
-static int slave_init = 0;
-
-static int current_pos = 0;
-
-void *csi_ecies_malloc(uint32_t size)
-{
-    void * ptr = NULL;
-
-    if (current_pos + size >= CONFIG_FASTBOOT_BUF_SIZE) {
-        current_pos = 0;
-    }
-
-    ptr = (void *)(long)(CONFIG_FASTBOOT_BUF_ADDR + ECIES_MALLOC_START + current_pos);
-    current_pos += size;
-    return ptr;
-};
-
-void csi_ecies_free(void *buffer)
-{
-    return;
-};
-
-static int ecies_data_write(uint8_t *buf,uint8_t *data,int data_len)
-{
-    char response[FASTBOOT_RESPONSE_LEN];
-
-    if (data_len == 0  || buf == NULL || data == NULL) {
-        return -1;
-    }
-
-    memcpy(buf + ecies_file_pos,data,data_len);
-    ecies_file_pos += data_len;
-    if (ecies_file_pos == sizeof(send_file_info_t) + ((send_file_info_t *)buf)->file_size) {
-        if (strcmp(((send_file_info_t *)buf)->partition_name, TEE_PART_NAME) == 0) {
-            memcpy((void *)LIGHT_TEE_FW_ADDR, buf + sizeof(send_file_info_t), ((send_file_info_t *)buf)->file_size);
-            #if CONFIG_IS_ENABLED(FASTBOOT_FLASH_MMC)
-            fastboot_mmc_flash_write(((send_file_info_t *)buf)->partition_name, buf + sizeof(send_file_info_t),  ((send_file_info_t *)buf)->file_size,
-                        response);
-            #endif
-            #if CONFIG_IS_ENABLED(FASTBOOT_FLASH_NAND)
-            fastboot_nand_flash_write(((send_file_info_t *)buf)->partition_name,  buf + sizeof(send_file_info_t), ((send_file_info_t *)buf)->file_size,
-                        response);
-            #endif
-        } else if (strcmp(((send_file_info_t *)buf)->partition_name, UBOOT_PART_NAME) == 0) {
-            fasboot_uboot_write_process(buf + sizeof(send_file_info_t),response);
-        } else {
-            printf("unknown partition name\n");
-            return -2;
-        }
-
-        ecies_file_pos = 0;
-    } else if(ecies_file_pos > sizeof(send_file_info_t) + ((send_file_info_t *)buf)->file_size) {
-        return -3;
-    }
-
-    return 0;
-}
-
-static void hex_to_str(char *dest, const uint8_t *src, int len)
-{
-    char ddl = 0;
-    char ddh = 0;
-    int i = 0;
-
-    for (i = 0; i < len; i++) {
-        ddh = 48 + src[i] / 16;
-        ddl = 48 + src[i] % 16;
-
-        if (ddh > 57) {
-            ddh = ddh + 7;
-        }
-
-        if (ddl > 57) {
-            ddl = ddl + 7;
-        }
-
-        dest[i * 2] = ddh;
-        dest[i * 2 + 1] = ddl;
-    }
-
-    dest[len * 2] = '\0';
-}
-
-int ecies_process_data(uint8_t * data, int data_size,char *response)
-{
-    static ecies_session_t ss_slave;
-    char apduResponse[ECIES_INIT_RESPONSE_LEN] = {0};
-    uint8_t *plaintext = csi_ecies_malloc(MAX_ECIES_IMAGE_SIZE);
-    uint32_t plaintextLen = 0;
-    uint32_t apduResponseLen = 0;
-    int ret = 0;
-    uint8_t cla = 0;
-    uint8_t errcode = 0;
-
-    if (plaintext == NULL) {
-        ret = -1;
-        goto end;
-    }
-
-    if (!slave_init) {
-        csi_sec_library_init();
-        ret = hal_ecies_slave_init(&ss_slave);
-        if (ret != 0) {
-            strcpy(response,"hal_ecies_slave_init ERROR");
-            ret = -2;
-            goto end;
-        }
-    }
-    ret = hal_ecies_slave_session_comm(&ss_slave, data, data_size, (uint8_t *)apduResponse, &apduResponseLen, plaintext, &plaintextLen);
-    if (ret != 0) {
-        ret = hal_ecies_status_get((uint8_t *)apduResponse, apduResponseLen, &cla, &errcode);
-        if (ret != 0) {
-            strcpy(response,"hal_ecies_errcode_get ERROR");
-            ret = -3;
-            goto end;
-        }
-
-        if (cla == ECIES_CLA_INITIALIZE_UPDATE_RESPONSE && errcode == ECIES_RESPONSE_SESSION_OPENED_ERROR) {
-            slave_init = 0;
-            ecies_file_pos = 0;
-            hal_ecies_slave_uninit(&ss_slave);
-            ret = hal_ecies_slave_init(&ss_slave);
-            if (ret != 0) {
-                strcpy(response,"hal_ecies_slave_init ERROR");
-                ret = -4;
-                goto end;
-            }
-            ret = hal_ecies_slave_session_comm(&ss_slave, data, data_size,  (uint8_t*)apduResponse, &apduResponseLen, plaintext, &plaintextLen);
-            if (ret != 0) {
-                strcpy(response,"hal_ecies_slave_session_comm ERROR");
-                ret = -5;
-                goto end;
-            }
-        } else if(errcode != ECIES_RESPONSE_OK) {
-            if (errcode == ECIES_CLA_SDATA_SEND_RESPONSE) {
-                strcpy(response,"ECIES_CLA_SDATA_SEND_RESPONSE ERROR");
-                ret = -6;
-                goto end;
-            } else if (errcode == ECIES_CLA_SESSION_CLOSE) {
-                strcpy(response,"ECIES_CLA_SESSION_CLOSE ERROR");
-                ret = -7;
-                goto end;
-            } else if (errcode == ECIES_CLA_INITIALIZE_UPDATE) {
-                strcpy(response,"ECIES_CLA_INITIALIZE_UPDATE ERROR");
-                ret = -8;
-                goto end;
-            }
-        }
-    }
-
-    if (slave_init && plaintextLen) {
-        ret = ecies_data_write((uint8_t*)(long)(CONFIG_FASTBOOT_BUF_ADDR + MAX_ECIES_IMAGE_SIZE),plaintext,plaintextLen);
-        if (ret != 0) {
-            strcpy(response,"ecies_data_write ERROR");
-            ret = -8;
-            goto end;
-        }
-    }
-
-    slave_init = 1;
-
-    strcpy(response,"SUCCESS:");
-    hex_to_str(response + strlen(response),(uint8_t*)apduResponse,apduResponseLen);
-    ret = 0;
-end:
-    if (plaintext) {
-        csi_ecies_free(plaintext);
-        plaintext = NULL;
-    }
-
-    return ret;
-}
-
-#endif
--- a/drivers/fastboot/fb_nv_operation.c
+++ b/drivers/fastboot/fb_nv_operation.c
@@ -1,342 +0,0 @@
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-
-#include <common.h>
-#include <fb_mmc.h>
-#include <command.h>
-#include <asm/io.h>
-#include <asm/types.h>
-#include <configs/light-c910.h>
-#include <thead/clock_config.h>
-#include <linux/bitops.h>
-#include <asm/arch-thead/light-iopmp.h>
-#include "../lib/sec_library/include/soc.h"
-
-#define MAX_NV_NUMBER_SIZE 32
-#define MAX_NV_DATA_SIZE 128
-#define NV_BLOCK_SIZE 512
-
-extern int32_t wj_efuse_get_lc(long unsigned int, int *lc);
-
-typedef enum {
-	FB_SYS_ACTION_FACTORY_RECOVER,
-	FB_SYS_ACTION_READ_EFUSE,
-} fb_sys_action_t;
-
-static int nv_get(uint8_t *data,int offset,int data_len)
-{
-	struct blk_desc *dev_desc;
-	struct disk_partition part_info;
-	ulong block_start;
-	uint8_t data_nv[NV_BLOCK_SIZE] = {0};
-	int ret;
-	int n;
-
-	dev_desc = blk_get_dev("mmc", CONFIG_FASTBOOT_FLASH_MMC_DEV);
-	if (dev_desc == NULL) {
-		return -1;
-	}
-
-	ret = part_get_info_by_name(dev_desc, NV_PARTITION_NAME, &part_info);
-	if (ret < 0) {
-                return -2;
-	}
-
-        if(NV_BLOCK_SIZE != dev_desc->blksz) {
-                return -4;
-        }
-
-	block_start = part_info.start + offset / dev_desc->blksz;
-	n = blk_dread(dev_desc, block_start, 1, data_nv);
-	if (n != 1) {
-                return -5;
-	}
-
-        memcpy(data,data_nv + offset % NV_BLOCK_SIZE,data_len);
-
-        return 0;
-}
-
-static int nv_set(uint8_t *data,int offset,int data_len)
-{
-        struct blk_desc *dev_desc;
-	struct disk_partition part_info;
-	ulong block_start;
-        uint8_t data_nv[NV_BLOCK_SIZE] = {0};
-        int ret;
-        int n;
-
-
-	dev_desc = blk_get_dev("mmc", CONFIG_FASTBOOT_FLASH_MMC_DEV);
-	if (dev_desc == NULL) {
-		return -1;
-	}
-
-	ret = part_get_info_by_name(dev_desc, NV_PARTITION_NAME, &part_info);
-	if (ret < 0) {
-                return -2;
-	}
-
-	if (NV_BLOCK_SIZE != dev_desc->blksz) {
-                return -3;
-        }
-
-	block_start = part_info.start + offset / dev_desc->blksz;
-
-	n = blk_dread(dev_desc, block_start, 1, data_nv);
-        if (n != 1) {
-                return -4;
-        }
-        memcpy(data_nv + offset % NV_BLOCK_SIZE,data,data_len);
-	n = blk_dwrite(dev_desc, block_start, 1, data_nv);
-	if (n != 1) {
-                return -5;
-	}
-
-    return 0;
-}
-
-static int factory_recovery(char *response)
-{
-#if CONFIG_IS_ENABLED(FASTBOOT_FLASH_MMC)
-        fastboot_mmc_erase("metadata", response);
-        if (strcmp(response, "OKAY") != 0) {
-                return -1;
-        }
-        fastboot_mmc_erase("misc", response);
-        if (strcmp(response, "OKAY") != 0) {
-                return -2;
-        }
-#endif
-#if CONFIG_IS_ENABLED(FASTBOOT_FLASH_NAND)
-        fastboot_nand_erase("metadata", response);
-        if (strcmp(response, "OKAY") != 0) {
-                return -3;
-        }
-        fastboot_nand_erase("misc", response);
-        if (strcmp(response, "OKAY") != 0) {
-                return -4;
-        }
-#endif
-
-        strcpy(response,"OKAY");
-
-        return 0;
-}
-
-static int read_efuse_status(char *response)
-{
-        int ret;
-        int lc = 0;
-        ret = wj_efuse_get_lc(WJ_EFUSE_BASE, &lc);
-        if (ret) {
-                return -1;
-        }
-
-        if(lc == 0) {
-                strcpy(response,"LC_INIT");
-        } else {
-                strcpy(response,"LC_BLOWNED");
-        }
-
-        return 0;
-
-}
-
-static int sys_action(int flag,char *response)
-{
-        if (flag == FB_SYS_ACTION_FACTORY_RECOVER) {
-                return factory_recovery(response);
-        } else if (flag == FB_SYS_ACTION_READ_EFUSE) {
-                return read_efuse_status(response);
-        } else {
-                return -1;
-        }
-
-        return 0;
-}
-
-static int toupper(int c)
-{
-        if (c >= 'a' && c <= 'z') {
-                return c - 32;
-        }
-
-        return c;
-}
-
-static void str_to_hex(uint8_t *dest, const char *src, int len)
-{
-        char h1, h2;
-        unsigned char s1, s2;
-
-        for (int i = 0; i < len; i++) {
-                h1 = src[2 * i];
-                h2 = src[2 * i + 1];
-                s1 = toupper(h1) - 48;
-                s2 = toupper(h2) - 48;
-                if (s1 > 9) {
-                        s1 = s1 - 7;
-                }
-
-                if (s2 > 9) {
-                        s2 = s2 - 7;
-                }
-
-                dest[i] = s1 * 16 + s2;
-        }
-}
-
-static void hex_to_str(char *dest, const uint8_t *src, int len)
-{
-        char ddl = 0;
-        char ddh = 0;
-        int i = 0;
-
-        for (i = 0; i < len; i++) {
-                ddh = 48 + src[i] / 16;
-                ddl = 48 + src[i] % 16;
-
-                if (ddh > 57) {
-                        ddh = ddh + 7;
-                }
-
-                if (ddl > 57) {
-                        ddl = ddl + 7;
-                }
-
-                dest[i * 2] = ddh;
-                dest[i * 2 + 1] = ddl;
-        }
-
-        dest[len * 2] = '\0';
-}
-
-static int char_to_int(char *data,int *out)
-{
-        *out = 0;
-        while(*data) {
-                if(*data < '0' || *data > '9')
-                return -1;
-
-                *out = *out * 10 + (*data - '0');
-                ++data;
-        }
-
-	return 0;
-}
-#if CONFIG_FASTBOOT_CMD_OEM_NV_OPERATION
-void oem_nv_factory_recovery_process(char *cmd_parameter, char *response)
-{
-        int ret = 0;
-        int flag = 0;
-
-        ret = char_to_int(cmd_parameter,&flag);
-        if (ret != 0) {
-                strcpy(response,"ERROR FLAG INVALID");
-                return;
-        }
-
-        ret = sys_action(flag,response);
-        if (ret != 0) {
-                strcpy(response,"ERROR SYS ACTION FAILED");
-                return;
-        }
-}
-
-
-void oem_nv_get_proccess(char *cmd_parameter, char *response)
- {
-        char *sep = NULL;
-        char offset[MAX_NV_NUMBER_SIZE] = {0};
-        char len[MAX_NV_NUMBER_SIZE] = {0};
-        int sep_pos = 0;
-        uint8_t nv_data[MAX_NV_DATA_SIZE + 32] = {0};
-        char nv_data_str[MAX_NV_DATA_SIZE * 2 + 1] = {0};
-        int ret;
-        int offset_int = 0;
-        int len_int = 0;
-
-        sep = strstr(cmd_parameter, ":");
-        if (sep == NULL) {
-                strcpy(response,"ERROR INVALID PARAM");
-                return;
-        }
-
-        sep_pos = sep - cmd_parameter;
-        memcpy(offset,cmd_parameter,sep - cmd_parameter);
-        memcpy(len,cmd_parameter + (sep - cmd_parameter) + 1,strlen(cmd_parameter) - sep_pos - 1);
-
-        ret = char_to_int(offset,&offset_int);
-        if (ret != 0) {
-                strcpy(response,"ERROR OFFSET INVALID");
-                return;
-        }
-
-        ret = char_to_int(len,&len_int);
-        if (ret != 0) {
-                strcpy(response,"ERROR LEN INVALID");
-                return;
-        }
-
-        if (len_int > MAX_NV_DATA_SIZE) {
-                strcpy(response,"ERROR NV SIZE TOO LARGE");
-                return;
-        }
-
-        ret = nv_get(nv_data, offset_int, len_int);
-        if (ret != 0) {
-                printf("nv_get failed:%d\n",ret);
-                strcpy(response,"ERROR NV GET FAILED");
-                return;
-        }
-
-        hex_to_str(nv_data_str,nv_data,len_int);
-        strcpy(response,"SUCCESS:");
-        strcat(response,nv_data_str);
- }
-
-void oem_nv_set_proccess(char *cmd_parameter, char *response)
-{
-        char *sep = NULL;
-        char offset[MAX_NV_NUMBER_SIZE] = {0};
-        uint8_t nv_data[MAX_NV_DATA_SIZE + 32] = {0};
-        char *nv_data_str;
-        int data_len;
-        int ret;
-        int offset_int = 0;
-
-        sep = strstr(cmd_parameter, ":");
-        if (sep == NULL) {
-                strcpy(response,"ERROR INVALID PARAM");
-                return;
-        }
-
-        memcpy(offset,cmd_parameter,sep - cmd_parameter);
-        nv_data_str = cmd_parameter + (sep - cmd_parameter) + 1;
-
-        data_len = strlen(nv_data_str) / 2;
-
-        ret = char_to_int(offset,&offset_int);
-        if (ret != 0) {
-                strcpy(response,"ERROR OFFSET INVALID");
-                return;
-        }
-
-        if (data_len > MAX_NV_DATA_SIZE) {
-                strcpy(response,"ERROR NV SIZE TOO LARGE");
-                return;
-        }
-
-        str_to_hex(nv_data,nv_data_str,data_len);
-
-        ret = nv_set(nv_data, offset_int, data_len);
-        if (ret != 0) {
-                strcpy(response,"ERROR NV SET FAILED");
-                return;
-        }
-
-        strcpy(response,"OKAY");
- }
- #endif
--- a/drivers/power/Kconfig
+++ b/drivers/power/Kconfig
@@ -16,8 +16,8 @@ config DM_CHARGE_DISPLAY
 	bool "Enable driver model for charge display support"
 	depends on DM
 	help
-	This adds a simple uclass for charge display.
-
+	  This adds a simple uclass for charge display.
+	  
 choice
 	prompt "Select Sunxi PMIC Variant"
 	depends on ARCH_SUNXI
@@ -89,7 +89,7 @@ config CHARGE_ANIMATION
 	depends on DM_CHARGE_DISPLAY && DM_FUEL_GAUGE
 	select ARM_CPU_SUSPEND
 	help
-	This adds a simple function for charge animation display.
+	  This adds a simple function for charge animation display.

 config AXP_DCDC1_VOLT
 	int "axp pmic dcdc1 voltage"
--- a/drivers/power/Makefile
+++ b/drivers/power/Makefile
@@ -3,13 +3,14 @@
 # Copyright (c) 2009 Wind River Systems, Inc.
 # Tom Rix <Tom.Rix at windriver.com>

-obj-$(CONFIG_DM_CHARGE_DISPLAY)        += charge-display-uclass.o
+obj-$(CONFIG_DM_CHARGE_DISPLAY)	+= charge-display-uclass.o
+
 obj-$(CONFIG_AXP152_POWER)	+= axp152.o
 obj-$(CONFIG_AXP209_POWER)	+= axp209.o
 obj-$(CONFIG_AXP221_POWER)	+= axp221.o
 obj-$(CONFIG_AXP809_POWER)	+= axp809.o
 obj-$(CONFIG_AXP818_POWER)	+= axp818.o
-obj-$(CONFIG_CHARGE_ANIMATION) += charge_animation.o
+obj-$(CONFIG_CHARGE_ANIMATION)	+= charge_animation.o
 obj-$(CONFIG_EXYNOS_TMU)	+= exynos-tmu.o
 obj-$(CONFIG_FTPMU010_POWER)	+= ftpmu010.o
 obj-$(CONFIG_SY8106A_POWER)	+= sy8106a.o
@@ -22,3 +23,4 @@ obj-$(CONFIG_DIALOG_POWER) += power_dialog.o
 obj-$(CONFIG_POWER_FSL) += power_fsl.o
 obj-$(CONFIG_POWER_I2C) += power_i2c.o
 obj-$(CONFIG_POWER_SPI) += power_spi.o
+
--- a/drivers/power/fuel_gauge/Makefile
+++ b/drivers/power/fuel_gauge/Makefile
@@ -2,6 +2,8 @@
 #
 # Copyright (C) 2012 Samsung Electronics
 # Lukasz Majewski <l.majewski@samsung.com>
+
 obj-$(CONFIG_$(SPL_)DM_FUEL_GAUGE) += fuel_gauge_uclass.o
+
 obj-$(CONFIG_POWER_FG_MAX17042) += fg_max17042.o
-obj-$(CONFIG_POWER_FG_CW201X) += fg_cw201x.o
+obj-$(CONFIG_POWER_FG_CW201X) += fg_cw201x.o
--- a/drivers/power/power_delivery/Kconfig
+++ b/drivers/power/power_delivery/Kconfig
@@ -19,11 +19,6 @@ config TYPEC_TCPCI
 	help
 	  Type-C Port Controller driver for TCPCI-compliant controller.

-config RV_BOOK
-	tristate "RV Book Type-C support"
-	help
-	  Enable support for rvbook device's Type-C Port Controller.
-
 if TYPEC_TCPCI

 config TYPEC_HUSB311
--- a/drivers/tpm/Kconfig
+++ b/drivers/tpm/Kconfig
@@ -93,6 +93,16 @@ config TPM_ST33ZP24_SPI
 	  to the device using the standard TPM Interface Specification (TIS)
 	  protocol

+config TPM_Z32H330TC_SPI
+	bool "STMicroelectronics Z32H330TC SPI TPM"
+	depends on TPM_V1 && DM_SPI
+	---help---
+	  This driver supports STMicroelectronics TPM devices connected on the SP
+	  I bus.
+	  The usual tpm operations and the 'tpm' command can be used to talk
+	  to the device using the standard TPM Interface Specification (TIS)
+	  protocol
+
 config TPM_FLUSH_RESOURCES
 	bool "Enable TPM resource flushing support"
 	depends on TPM_V1
@@ -145,18 +155,6 @@ config TPM2_TIS_SPI
 	  to the device using the standard TPM Interface Specification (TIS)
 	  protocol.

-config TPM_Z32H330TC_SPI
-	bool "STMicroelectronics Z32H330TC SPI TPM"
-	depends on TPM_V2 && DM_SPI
-	---help---
-	  This driver supports STMicroelectronics TPM devices connected on the SPI bus.
-	  The usual tpm operations and the 'tpm' command can be used to talk
-	  to the device using the standard TPM Interface Specification (TIS)
-	  protocol
-
-config CMD_MEASURED_BOOT
-	bool "Enable support for measured_boot to bootcmd"
-
 endif # TPM_V2

 endmenu
--- a/drivers/video/Kconfig
+++ b/drivers/video/Kconfig
@@ -351,16 +351,24 @@ config VIDEO_LCD_ILITEK_ILI9881C
 	Say Y here if you want to enable support for ILITEK ILI9881C
 	800x1280 DSI video mode panel.

+config VIDEO_LCD_MINGJUN_070BI30IA2
+	bool "MingJun 070BI30IA2 DSI LCD panel support"
+	depends on DM_VIDEO
+	select VIDEO_MIPI_DSI
+	help
+	Say Y here if you want to enable support for Mingjun 070BI30IA2
+        800x1280 DSI video mode panel.
+
 config VIDEO_LCD_JD9365DA
 	bool "JD9365DA DSI LCD panel support"
 	depends on DM_VIDEO
 	select VIDEO_MIPI_DSI
 	help
 	Say Y here if you want to enable support for JD9365DA
-	800x1280 DSI video mode panel.

 config VIDEO_LCD_CUSTOM_LOGO
 	bool "LCD CUSTOM logo support"
+	default n
 	help
 	Say Y here if you want to enable support for custom logo.

--- a/drivers/video/Makefile
+++ b/drivers/video/Makefile
@@ -55,6 +55,7 @@ obj-$(CONFIG_VIDEO_LCD_HITACHI_TX18D42VM) += hitachi_tx18d42vm_lcd.o
 obj-$(CONFIG_VIDEO_LCD_ORISETECH_OTM8009A) += orisetech_otm8009a.o
 obj-$(CONFIG_VIDEO_LCD_RAYDIUM_RM68200) += raydium-rm68200.o
 obj-$(CONFIG_VIDEO_LCD_ILITEK_ILI9881C) += ilitek-ili9881c.o
+obj-$(CONFIG_VIDEO_LCD_MINGJUN_070BI30IA2) += mingjun-070bi30ia2.o
 obj-$(CONFIG_VIDEO_LCD_SSD2828) += ssd2828.o
 obj-$(CONFIG_VIDEO_MB862xx) += mb862xx.o videomodes.o
 obj-${CONFIG_VIDEO_MESON} += meson/
--- a/drivers/video/ilitek-ili9881c.c
+++ b/drivers/video/ilitek-ili9881c.c
@@ -12,6 +12,7 @@ enum ili9881c_op {
 	ILI9881C_COMMAND,
 };

+
 struct ili9881c_instr {
 	enum ili9881c_op        op;

@@ -368,12 +369,12 @@ static int ili9881c_panel_prepare(struct udevice *panel)
 	ret = dm_gpio_set_value(&priv->reset, true);
 	if (ret)
 		return ret;
-	mdelay(1);
+	mdelay(500);

 	ret = dm_gpio_set_value(&priv->reset, false);
 	if (ret)
 		return ret;
-	mdelay(10);
+	mdelay(100);

 	return 0;
 }
@@ -464,8 +465,23 @@ static int ili9881c_panel_ofdata_to_platdata(struct udevice *dev)
 		dev_err(dev, "Warning: cannot get reset GPIO\n");
 		if (ret != -ENOENT)
 			return ret;
+	} else {
+		/* not a bug, but uboot's regulator is buggy,
+		I haven't more time to fix it, so put it here
+		*/
+		/* reset panel */
+		ret = dm_gpio_set_value(&priv->reset, false);
+		if (ret)
+			return ret;
+		mdelay(100);
+
+		ret = dm_gpio_set_value(&priv->reset, true);
+		if (ret)
+			return ret;
+		mdelay(100);
 	}

+
 	/* power gpios */
 	ret = gpio_request_by_name(dev, "lcd-en-gpios", 0,
 			&priv->lcd_en, GPIOD_IS_OUT);
--- a/drivers/video/mingjun-070bi30ia2.c
+++ b/drivers/video/mingjun-070bi30ia2.c
@@ -0,0 +1,490 @@
+// SPDX-License-Identifier: GPL-2.0+
+
+#include <common.h>
+#include <backlight.h>
+#include <dm.h>
+#include <mipi_dsi.h>
+#include <panel.h>
+#include <asm/gpio.h>
+
+struct mingjun_panel_cmd {
+	char cmdlen;
+	char cmddata[0x40];
+};
+
+static const struct mingjun_panel_cmd mingjun_on_cmds[] = {
+	// { .cmdlen = 4,	.cmddata = {0xB9, 0xFF, 0x83, 0x94} },
+	// { .cmdlen = 11,	.cmddata = {0xB1, 0x48, 0x0A, 0x6A, 0x09, 0x33, 0x54,
+	// 			0x71, 0x71, 0x2E, 0x45} },
+	// { .cmdlen = 7,	.cmddata = {0xBA, 0x63, 0x03, 0x68, 0x6B, 0xB2, 0xC0} },
+	// { .cmdlen = 7,	.cmddata = {0xB2, 0x00, 0x80, 0x64, 0x0C, 0x06, 0x2F} },
+	// { .cmdlen = 22, .cmddata = {0xB4, 0x1C, 0x78, 0x1C, 0x78, 0x1C, 0x78, 0x01,
+	// 			0x0C, 0x86, 0x75, 0x00, 0x3F, 0x1C, 0x78, 0x1C,
+	// 			0x78, 0x1C, 0x78, 0x01, 0x0C, 0x86} },
+	// { .cmdlen = 34, .cmddata = {0xD3, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08,
+	// 			0x08, 0x32, 0x10, 0x05, 0x00, 0x05, 0x32, 0x13,
+	// 			0xC1, 0x00, 0x01, 0x32, 0x10, 0x08, 0x00, 0x00,
+	// 			0x37, 0x03, 0x07, 0x07, 0x37, 0x05, 0x05, 0x37,
+	// 			0x0C, 0x40} },
+	// { .cmdlen = 45, .cmddata = {0xD5, 0x18, 0x18, 0x18, 0x18, 0x22, 0x23, 0x20,
+	// 			0x21, 0x04, 0x05, 0x06, 0x07, 0x00, 0x01, 0x02,
+	// 			0x03, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18,
+	// 			0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18,
+	// 			0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18,
+	// 			0x18, 0x19, 0x19, 0x19, 0x19} },
+	// { .cmdlen = 45, .cmddata = {0xD6, 0x18, 0x18, 0x19, 0x19, 0x21, 0x20, 0x23,
+	// 			0x22, 0x03, 0x02, 0x01, 0x00, 0x07, 0x06, 0x05,
+	// 			0x04, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18,
+	// 			0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18,
+	// 			0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18,
+	// 			0x18, 0x19, 0x19, 0x18, 0x18} },
+	// { .cmdlen = 59, .cmddata = {0xE0, 0x07, 0x08, 0x09, 0x0D, 0x10, 0x14, 0x16,
+	// 			0x13, 0x24, 0x36, 0x48, 0x4A, 0x58, 0x6F, 0x76,
+	// 			0x80, 0x97, 0xA5, 0xA8, 0xB5, 0xC6, 0x62, 0x63,
+	// 			0x68, 0x6F, 0x72, 0x78, 0x7F, 0x7F, 0x00, 0x02,
+	// 			0x08, 0x0D, 0x0C, 0x0E, 0x0F, 0x10, 0x24, 0x36,
+	// 			0x48, 0x4A, 0x58, 0x6F, 0x78, 0x82, 0x99, 0xA4,
+	// 			0xA0, 0xB1, 0xC0, 0x5E, 0x5E, 0x64, 0x6B, 0x6C,
+	// 			0x73, 0x7F, 0x7F} },
+	// { .cmdlen = 2, .cmddata = {0xCC, 0x03} },
+	// { .cmdlen = 3, .cmddata = {0xC0, 0x1F, 0x73} },
+	// { .cmdlen = 3, .cmddata = {0xB6, 0x90, 0x90} },
+	// { .cmdlen = 2, .cmddata = {0xD4, 0x02} },
+	// { .cmdlen = 2, .cmddata = {0xBD, 0x01} },
+	// { .cmdlen = 2, .cmddata = {0xB1, 0x00} },
+	// { .cmdlen = 2, .cmddata = {0xBD, 0x00} },
+	// { .cmdlen = 8, .cmddn bata = {0xBF, 0x40, 0x81, 0x50, 0x00, 0x1A, 0xFC, 0x01} },
+
+	// { .cmdlen = 2, .cmddata = {0x36, 0x02} },
+{ .cmdlen =4, .cmddata = {0xFF,0x98,0x81,0x03} },
+{ .cmdlen = 2, .cmddata = {0x01,0x00} },
+{ .cmdlen = 2, .cmddata = {0x02,0x00} },
+{ .cmdlen = 2, .cmddata = {0x03,0x73} },
+{ .cmdlen = 2, .cmddata = {0x04,0x13} },
+{ .cmdlen = 2, .cmddata = {0x05,0x00} },
+{ .cmdlen = 2, .cmddata = {0x06,0x0A} },
+{ .cmdlen = 2, .cmddata = {0x07,0x05} },
+{ .cmdlen = 2, .cmddata = {0x11,0x00} },
+{ .cmdlen = 2, .cmddata = {0x09,0x28} },
+{ .cmdlen = 2, .cmddata = {0x0A,0x00} },
+{ .cmdlen = 2, .cmddata = {0x0B,0x00} },
+{ .cmdlen = 2, .cmddata = {0x0C,0x00} },
+{ .cmdlen = 2, .cmddata = {0x0D,0x28} },
+{ .cmdlen = 2, .cmddata = {0x0E,0x00} },
+{ .cmdlen = 2, .cmddata = {0x0F,0x28} },
+{ .cmdlen = 2, .cmddata = {0x10,0x28} },
+{ .cmdlen = 2, .cmddata = {0x11,0x00} },
+{ .cmdlen = 2, .cmddata = {0x12,0x00} },
+{ .cmdlen = 2, .cmddata = {0x13,0x00} },
+{ .cmdlen = 2, .cmddata = {0x14,0x00} },
+{ .cmdlen = 2, .cmddata = {0x15,0x00} },
+{ .cmdlen = 2, .cmddata = {0x16,0x00} },
+{ .cmdlen = 2, .cmddata = {0x17,0x00} },
+{ .cmdlen = 2, .cmddata = {0x18,0x00} },
+{ .cmdlen = 2, .cmddata = {0x19,0x00} },
+{ .cmdlen = 2, .cmddata = {0x1A,0x00} },
+{ .cmdlen = 2, .cmddata = {0x1B,0x00} },
+{ .cmdlen = 2, .cmddata = {0x1C,0x00} },
+{ .cmdlen = 2, .cmddata = {0x1D,0x00} },
+{ .cmdlen = 2, .cmddata = {0x1E,0x40} },
+{ .cmdlen = 2, .cmddata = {0x1F,0x80} },
+{ .cmdlen = 2, .cmddata = {0x20,0x06} },
+{ .cmdlen = 2, .cmddata = {0x21,0x01} },
+{ .cmdlen = 2, .cmddata = {0x22,0x00} },
+{ .cmdlen = 2, .cmddata = {0x23,0x00} },
+{ .cmdlen = 2, .cmddata = {0x24,0x00} },
+{ .cmdlen = 2, .cmddata = {0x25,0x00} },
+{ .cmdlen = 2, .cmddata = {0x26,0x00} },
+{ .cmdlen = 2, .cmddata = {0x27,0x00} },
+{ .cmdlen = 2, .cmddata = {0x28,0x33} },
+{ .cmdlen = 2, .cmddata = {0x29,0x33} },
+{ .cmdlen = 2, .cmddata = {0x2A,0x00} },
+{ .cmdlen = 2, .cmddata = {0x2B,0x00} },
+{ .cmdlen = 2, .cmddata = {0x2C,0x04} },
+{ .cmdlen = 2, .cmddata = {0x2D,0x0C} },
+{ .cmdlen = 2, .cmddata = {0x2E,0x05} },
+{ .cmdlen = 2, .cmddata = {0x2F,0x05} },
+{ .cmdlen = 2, .cmddata = {0x30,0x00} },
+{ .cmdlen = 2, .cmddata = {0x31,0x00} },
+{ .cmdlen = 2, .cmddata = {0x32,0x31} },
+{ .cmdlen = 2, .cmddata = {0x33,0x00} },
+{ .cmdlen = 2, .cmddata = {0x34,0x00} },
+{ .cmdlen = 2, .cmddata = {0x35,0x0A} },
+{ .cmdlen = 2, .cmddata = {0x36,0x00} },
+{ .cmdlen = 2, .cmddata = {0x37,0x08} },
+{ .cmdlen = 2, .cmddata = {0x70,0x00} },
+{ .cmdlen = 2, .cmddata = {0x39,0x00} },
+{ .cmdlen = 2, .cmddata = {0x3A,0x00} },
+{ .cmdlen = 2, .cmddata = {0x3B,0x00} },
+{ .cmdlen = 2, .cmddata = {0x3C,0x00} },
+{ .cmdlen = 2, .cmddata = {0x3D,0x00} },
+{ .cmdlen = 2, .cmddata = {0x3E,0x00} },
+{ .cmdlen = 2, .cmddata = {0x3F,0x00} },
+{ .cmdlen = 2, .cmddata = {0x40,0x00} },
+{ .cmdlen = 2, .cmddata = {0x41,0x00} },
+{ .cmdlen = 2, .cmddata = {0x42,0x00} },
+{ .cmdlen = 2, .cmddata = {0x43,0x08} },
+{ .cmdlen = 2, .cmddata = {0x44,0x00} },
+{ .cmdlen = 2, .cmddata = {0xA0,0x02} },
+{ .cmdlen = 2, .cmddata = {0x51,0x23} },
+{ .cmdlen = 2, .cmddata = {0x52,0x44} },
+{ .cmdlen = 2, .cmddata = {0x53,0x67} },
+{ .cmdlen = 2, .cmddata = {0x54,0x89} },
+{ .cmdlen = 2, .cmddata = {0x55,0xAB} },
+{ .cmdlen = 2, .cmddata = {0x56,0x01} },
+{ .cmdlen = 2, .cmddata = {0x57,0x23} },
+{ .cmdlen = 2, .cmddata = {0x58,0x45} },
+{ .cmdlen = 2, .cmddata = {0x59,0x67} },
+{ .cmdlen = 2, .cmddata = {0x5A,0x89} },
+{ .cmdlen = 2, .cmddata = {0x5B,0xAB} },
+{ .cmdlen = 2, .cmddata = {0x5C,0xCD} },
+{ .cmdlen = 2, .cmddata = {0x5D,0xEF} },
+{ .cmdlen = 2, .cmddata = {0x5E,0x11} },
+{ .cmdlen = 2, .cmddata = {0x5F,0x02} },
+{ .cmdlen = 2, .cmddata = {0x60,0x08} },
+{ .cmdlen = 2, .cmddata = {0x61,0x0E} },
+{ .cmdlen = 2, .cmddata = {0x62,0x0F} },
+{ .cmdlen = 2, .cmddata = {0x63,0x0C} },
+{ .cmdlen = 2, .cmddata = {0x64,0x0D} },
+{ .cmdlen = 2, .cmddata = {0x65,0x17} },
+{ .cmdlen = 2, .cmddata = {0x66,0x01} },
+{ .cmdlen = 2, .cmddata = {0x67,0x01} },
+{ .cmdlen = 2, .cmddata = {0x68,0x02} },
+{ .cmdlen = 2, .cmddata = {0x69,0x02} },
+{ .cmdlen = 2, .cmddata = {0x6A,0x00} },
+{ .cmdlen = 2, .cmddata = {0x6B,0x00} },
+{ .cmdlen = 2, .cmddata = {0x6C,0x02} },
+{ .cmdlen = 2, .cmddata = {0x6D,0x02} },
+{ .cmdlen = 2, .cmddata = {0x6E,0x16} },
+{ .cmdlen = 2, .cmddata = {0x6F,0x16} },
+{ .cmdlen = 2, .cmddata = {0x70,0x06} },
+{ .cmdlen = 2, .cmddata = {0x71,0x06} },
+{ .cmdlen = 2, .cmddata = {0x72,0x07} },
+{ .cmdlen = 2, .cmddata = {0x73,0x07} },
+{ .cmdlen = 2, .cmddata = {0x74,0x02} },
+{ .cmdlen = 2, .cmddata = {0x75,0x02} },
+{ .cmdlen = 2, .cmddata = {0x76,0x08} },
+{ .cmdlen = 2, .cmddata = {0x77,0x0E} },
+{ .cmdlen = 2, .cmddata = {0x78,0x0F} },
+{ .cmdlen = 2, .cmddata = {0x79,0x0C} },
+{ .cmdlen = 2, .cmddata = {0x7A,0x0D} },
+{ .cmdlen = 2, .cmddata = {0x7B,0x17} },
+{ .cmdlen = 2, .cmddata = {0x7C,0x01} },
+{ .cmdlen = 2, .cmddata = {0x7D,0x01} },
+{ .cmdlen = 2, .cmddata = {0x7E,0x02} },
+{ .cmdlen = 2, .cmddata = {0x7F,0x02} },
+{ .cmdlen = 2, .cmddata = {0x80,0x00} },
+{ .cmdlen = 2, .cmddata = {0x81,0x00} },
+{ .cmdlen = 2, .cmddata = {0x82,0x02} },
+{ .cmdlen = 2, .cmddata = {0x83,0x02} },
+{ .cmdlen = 2, .cmddata = {0x84,0x16} },
+{ .cmdlen = 2, .cmddata = {0x85,0x16} },
+{ .cmdlen = 2, .cmddata = {0x86,0x06} },
+{ .cmdlen = 2, .cmddata = {0x87,0x06} },
+{ .cmdlen = 2, .cmddata = {0x88,0x07} },
+{ .cmdlen = 2, .cmddata = {0x89,0x07} },
+{ .cmdlen = 2, .cmddata = {0x8A,0x02} },
+{ .cmdlen = 4, .cmddata = {0xFF,0x98,0x81,0x04} },
+{ .cmdlen = 2, .cmddata = {0x6E,0x1A} },
+{ .cmdlen = 2, .cmddata = {0x6F,0x37} },
+{ .cmdlen = 2, .cmddata = {0x3A,0xA4} },
+{ .cmdlen = 2, .cmddata = {0x8D,0x1F} },
+{ .cmdlen = 2, .cmddata = {0x87,0xBA} },
+{ .cmdlen = 2, .cmddata = {0xB2,0xD1} },
+{ .cmdlen = 2, .cmddata = {0x88,0x0B} },
+{ .cmdlen = 2, .cmddata = {0x38,0x01} },
+{ .cmdlen = 2, .cmddata = {0x39,0x00} },
+{ .cmdlen = 2, .cmddata = {0xB5,0x02} },
+{ .cmdlen = 2, .cmddata = {0x31,0x25} },
+{ .cmdlen = 2, .cmddata = {0x3B,0x98} },
+{ .cmdlen = 4, .cmddata = {0xFF,0x98,0x81,0x01} },
+{ .cmdlen = 2, .cmddata = {0x22,0x0A} },
+{ .cmdlen = 2, .cmddata = {0x31,0x00} },
+{ .cmdlen = 2, .cmddata = {0xA6,0xA6} },
+{ .cmdlen = 2, .cmddata = {0x55,0x3D} },
+{ .cmdlen = 2, .cmddata = {0x50,0x9E} },
+{ .cmdlen = 2, .cmddata = {0x51,0x99} },
+{ .cmdlen = 2, .cmddata = {0x60,0x06} },
+{ .cmdlen = 2, .cmddata = {0x62,0x20} },
+{ .cmdlen = 2, .cmddata = {0xA0,0x00} },
+{ .cmdlen = 2, .cmddata = {0xA1,0x17} },
+{ .cmdlen = 2, .cmddata = {0xA2,0x26} },
+{ .cmdlen = 2, .cmddata = {0xA3,0x13} },
+{ .cmdlen = 2, .cmddata = {0xA4,0x16} },
+{ .cmdlen = 2, .cmddata = {0xA5,0x29} },
+{ .cmdlen = 2, .cmddata = {0xA6,0x1E} },
+{ .cmdlen = 2, .cmddata = {0xA7,0x1F} },
+{ .cmdlen = 2, .cmddata = {0xA8,0x8B} },
+{ .cmdlen = 2, .cmddata = {0xA9,0x1D} },
+{ .cmdlen = 2, .cmddata = {0xAA,0x2A} },
+{ .cmdlen = 2, .cmddata = {0xAB,0x7B} },
+{ .cmdlen = 2, .cmddata = {0xAC,0x1A} },
+{ .cmdlen = 2, .cmddata = {0xAD,0x19} },
+{ .cmdlen = 2, .cmddata = {0xAE,0x4E} },
+{ .cmdlen = 2, .cmddata = {0xAF,0x24} },
+{ .cmdlen = 2, .cmddata = {0xB0,0x29} },
+{ .cmdlen = 2, .cmddata = {0xB1,0x4F} },
+{ .cmdlen = 2, .cmddata = {0xB2,0x5C} },
+{ .cmdlen = 2, .cmddata = {0xB3,0x3E} },
+{ .cmdlen = 2, .cmddata = {0xC0,0x00} },
+{ .cmdlen = 2, .cmddata = {0xC1,0x17} },
+{ .cmdlen = 2, .cmddata = {0xC2,0x26} },
+{ .cmdlen = 2, .cmddata = {0xC3,0x13} },
+{ .cmdlen = 2, .cmddata = {0xC4,0x16} },
+{ .cmdlen = 2, .cmddata = {0xC5,0x29} },
+{ .cmdlen = 2, .cmddata = {0xC6,0x1E} },
+{ .cmdlen = 2, .cmddata = {0xC7,0x1F} },
+{ .cmdlen = 2, .cmddata = {0xC8,0x8B} },
+{ .cmdlen = 2, .cmddata = {0xC9,0x1D} },
+{ .cmdlen = 2, .cmddata = {0xCA,0x2A} },
+{ .cmdlen = 2, .cmddata = {0xCB,0x7B} },
+{ .cmdlen = 2, .cmddata = {0xCC,0x1A} },
+{ .cmdlen = 2, .cmddata = {0xCD,0x19} },
+{ .cmdlen = 2, .cmddata = {0xCE,0x4E} },
+{ .cmdlen = 2, .cmddata = {0xCF,0x24} },
+{ .cmdlen = 2, .cmddata = {0xD0,0x29} },
+{ .cmdlen = 2, .cmddata = {0xD1,0x4D} },
+{ .cmdlen = 2, .cmddata = {0xD2,0x5C} },
+{ .cmdlen = 2, .cmddata = {0xD3,0x3E} },
+{ .cmdlen = 4, .cmddata = {0xFF,0x98,0x81,0x00} },
+{ .cmdlen = 2, .cmddata = {0x11,0x00} },
+{ .cmdlen = 2, .cmddata = {0x29,0x00} },
+{ .cmdlen = 2, .cmddata = {0x35,0x00} },
+{ .cmdlen = 2, .cmddata = {0x00,0x00} },
+};
+
+
+struct mj070bi30ia2_desc {
+	const struct mingjun_panel_cmd *on_cmds;
+	unsigned int on_cmds_num;
+	const struct display_timing *timing;
+};
+
+struct mj070bi30ia2_panel_priv {
+	struct udevice *backlight;
+	struct gpio_desc reset;
+	const struct mj070bi30ia2_desc *desc;
+};
+
+static const struct display_timing mj070bi30ia2_timing = {
+	.pixelclock.typ		= 75750000,
+	.hactive.typ		= 800,
+	.hfront_porch.typ	= 48,
+	.hback_porch.typ	= 80,
+	.hsync_len.typ		= 32,
+	.vactive.typ		= 1280,
+	.vfront_porch.typ	= 3,
+	.vback_porch.typ	= 24,
+	.vsync_len.typ		= 10,
+	.flags			= DISPLAY_FLAGS_HSYNC_LOW | DISPLAY_FLAGS_VSYNC_LOW,
+};
+
+static int mingjun_send_mipi_cmds(struct udevice *panel,
+					struct mingjun_panel_cmd *cmds)
+{
+	struct mipi_dsi_panel_plat *plat = dev_get_platdata(panel);
+	struct mipi_dsi_device *dsi = plat->device;
+	struct mj070bi30ia2_panel_priv *priv = dev_get_priv(panel);
+	int ret;
+	int i;
+
+	for (i = 0; i < priv->desc->on_cmds_num; i++) {
+		ret = mipi_dsi_dcs_write_buffer(dsi,
+				&(cmds[i].cmddata[0]), cmds[i].cmdlen);
+		if (ret < 0)
+			return ret;
+	}
+	dev_info(dsi->dev, "%s: send initial instruction\n", __func__);
+
+	return 0;
+}
+
+static int mj070bi30ia2_panel_setup(struct udevice *panel)
+{
+	int ret;
+	u8 power_mode;
+	const struct mj070bi30ia2_instr *instr;
+	struct mj070bi30ia2_panel_priv *priv = dev_get_priv(panel);
+	struct mipi_dsi_panel_plat *plat = dev_get_platdata(panel);
+	struct mipi_dsi_device *dsi = plat->device;
+
+	dsi->mode_flags |= MIPI_DSI_MODE_LPM;
+
+	/* sanity test for connection */
+	ret = mipi_dsi_dcs_get_power_mode(dsi, &power_mode);
+	if (ret) {
+		dev_warn(dsi->dev, "%s: failed to get power mode: %d\n", __func__, ret);
+		return ret;
+	}
+
+	return 0;
+}
+
+static int mj070bi30ia2_panel_prepare(struct udevice *panel)
+{
+	struct mj070bi30ia2_panel_priv *priv = dev_get_priv(panel);
+	int ret;
+
+	/* reset panel */
+	ret = dm_gpio_set_value(&priv->reset, true);
+	if (ret)
+		return ret;
+	mdelay(1);
+
+	ret = dm_gpio_set_value(&priv->reset, false);
+	if (ret)
+		return ret;
+	mdelay(10);
+
+	return 0;
+}
+
+static int mj070bi30ia2_panel_enable(struct udevice *panel)
+{
+	int ret;
+	struct mj070bi30ia2_panel_priv *priv = dev_get_priv(panel);
+	struct mipi_dsi_panel_plat *plat = dev_get_platdata(panel);
+	struct mipi_dsi_device *dsi = plat->device;
+
+	dsi->mode_flags |= MIPI_DSI_MODE_LPM;
+
+	ret = mingjun_send_mipi_cmds(panel, priv->desc->on_cmds);
+	if (ret < 0) {
+		dev_err(panel->dev, "failed to send DCS Init Code: %d\n", ret);
+		return ret;
+	}
+
+	ret = mipi_dsi_dcs_set_tear_on(dsi, MIPI_DSI_DCS_TEAR_MODE_VBLANK);
+	if (ret)
+		return ret;
+
+	ret = mipi_dsi_dcs_exit_sleep_mode(dsi);
+	if (ret)
+		return ret;
+
+	mdelay(10);
+
+	ret = mipi_dsi_dcs_set_display_on(dsi);
+	if (ret)
+		return ret;
+
+#if 0
+	ret = backlight_enable(priv->backlight);
+	if (ret)
+		return ret;
+#endif
+
+	return 0;
+}
+
+static int mj070bi30ia2_panel_enable_backlight(struct udevice *dev)
+{
+	int ret;
+	struct mipi_dsi_panel_plat *plat = dev_get_platdata(dev);
+	struct mipi_dsi_device *device = plat->device;
+
+	ret = mipi_dsi_attach(device);
+	if (ret < 0)
+		return ret;
+
+	ret = mj070bi30ia2_panel_setup(dev);
+	if (ret)
+		return ret;
+
+	ret = mj070bi30ia2_panel_enable(dev);
+	if (ret)
+		return ret;
+
+	return 0;
+}
+
+static int mj070bi30ia2_panel_get_display_timing(struct udevice *dev,
+					     struct display_timing *timings)
+{
+	struct mipi_dsi_panel_plat *plat = dev_get_platdata(dev);
+	struct mipi_dsi_device *device = plat->device;
+	struct mj070bi30ia2_panel_priv *priv = dev_get_priv(dev);
+
+	memcpy(timings, priv->desc->timing, sizeof(*timings));
+
+	device->lanes	= 4;
+	device->format	= MIPI_DSI_FMT_RGB888;
+	device->mode_flags = MIPI_DSI_MODE_VIDEO | MIPI_DSI_MODE_VIDEO_BURST;
+
+	return 0;
+}
+
+static int mj070bi30ia2_panel_ofdata_to_platdata(struct udevice *dev)
+{
+	struct mj070bi30ia2_panel_priv *priv = dev_get_priv(dev);
+	int ret;
+
+	ret = gpio_request_by_name(dev, "reset-gpios", 0,
+			&priv->reset, GPIOD_IS_OUT);
+	if (ret) {
+		dev_err(dev, "Warning: cannot get reset GPIO\n");
+		return ret;
+	}
+
+	ret = uclass_get_device_by_phandle(UCLASS_PANEL_BACKLIGHT, dev,
+					   "backlight", &priv->backlight);
+	if (ret) {
+		dev_err(dev, "Cannot get backlight: ret=%d\n", ret);
+	}
+
+	/* TODO: get lanes, format and mode from dtb */
+
+	return 0;
+}
+
+static int mj070bi30ia2_panel_probe(struct udevice *panel)
+{
+	int ret;
+	struct mj070bi30ia2_panel_priv *priv = dev_get_priv(panel);
+
+	priv->desc = (const struct mj070bi30ia2_desc *)dev_get_driver_data(panel);
+
+	/* prepare_panel */
+	ret = mj070bi30ia2_panel_prepare(panel);
+	if (ret) {
+		dev_err(panel, "failed to prepare panel : %d\n", ret);
+		return ret;
+	}
+
+	return 0;
+}
+
+static int mj070bi30ia2_panel_remove(struct udevice *panel)
+{
+	struct mj070bi30ia2_panel_priv *priv = dev_get_priv(panel);
+
+	return dm_gpio_set_value(&priv->reset, true);
+}
+
+static const struct mj070bi30ia2_desc mj070bi30ia2_desc = {
+	.on_cmds = mingjun_on_cmds,
+	.on_cmds_num = ARRAY_SIZE(mingjun_on_cmds),
+        .timing = &mj070bi30ia2_timing,
+};
+
+static const struct panel_ops mj070bi30ia2_panel_ops = {
+	.enable_backlight	= mj070bi30ia2_panel_enable_backlight,
+	.get_display_timing	= mj070bi30ia2_panel_get_display_timing,
+};
+
+static const struct udevice_id mj070bi30ia2_panel_ids[] = {
+	{ .compatible = "mingjun,mj070bi30ia2", .data = (ulong)&mj070bi30ia2_desc },
+	{ /* sentinel */ }
+};
+
+U_BOOT_DRIVER(mj070bi30ia2_panel) = {
+	.name 			  = "mj070bi30ia2_panel",
+	.id			  = UCLASS_PANEL,
+	.of_match		  = mj070bi30ia2_panel_ids,
+	.ops			  = &mj070bi30ia2_panel_ops,
+	.ofdata_to_platdata	  = mj070bi30ia2_panel_ofdata_to_platdata,
+	.probe			  = mj070bi30ia2_panel_probe,
+	.remove			  = mj070bi30ia2_panel_remove,
+	.platdata_auto_alloc_size = sizeof(struct mipi_dsi_panel_plat),
+	.priv_auto_alloc_size	  = sizeof(struct mj070bi30ia2_panel_priv),
+};
--- a/env/env.c
+++ b/env/env.c
@@ -243,7 +243,7 @@ int env_save(void)
 		if (!env_has_inited(drv->location))
 			return -ENODEV;

-		printf("Saving Environment to %s... ", drv->name);
+		// printf("Saving Environment to %s... ", drv->name);
 		ret = drv->save();
 		if (ret)
 			printf("Failed (%d)\n", ret);
--- a/include/configs/light-c910.h
+++ b/include/configs/light-c910.h
@@ -79,15 +79,16 @@


 /* trust image name string */
+#define TF_IMG_UPD_NAME		"stashtf"
+#define TEE_IMG_UPD_NAME	"stashtee"
 #define UBOOT_IMG_UPD_NAME	"stashuboot"
+#define SBMETA_IMG_UPD_NAME	"stashsbmeta"
 #define TF_PART_NAME		"tf"
 #define TEE_PART_NAME		"tee"
 #define UBOOT_PART_NAME		"uboot"
 #define STASH_PART_NAME 	"stash"
 #define KERNEL_PART_NAME	"kernel"
 #define SBMETA_PART_NAME	"sbmeta"
-/* Define the NV partition name */
-#define NV_PARTITION_NAME	"nv"

 #define UBOOT_STAGE_ADDR	SRAM_BASE_ADDR

@@ -99,10 +100,10 @@
 #define CONFIG_BMP_32BPP

 /* security upgrade flag */
+#define TF_SEC_UPGRADE_FLAG	0x5555aaaa
+#define TEE_SEC_UPGRADE_FLAG 0x5a5aa5a5
 #define UBOOT_SEC_UPGRADE_FLAG	0xa5a5aa55
-#define SEC_IMG_UPGRADE_FLAG	0x5a5a
-#define BOOT_IMG_UPGRADE_FLAG	0xa500
-#define ROOT_IMG_UPGRADE_FLAG	0xa5
+#define SBMETA_SEC_UPGRADE_FLAG 0xaaaa5555

 /* Define secure debug log level */
 #define LOG_LEVEL	1
@@ -134,630 +135,48 @@
 /*public bootargs in mostly boards, make env 'set_booargs' shorter and clean */
 #define ENV_PUBLIC_BOOTARGS "pub_bootargs=rootfstype=ext4 rdinit=/sbin/init rootwait rw earlycon clk_ignore_unused\0"

-/* Define board ID in ENV for firmware download protection */
-#if defined(CONFIG_LIGHT_ANDROID_BOOT_IMAGE_VAL_A) || \
-    defined(CONFIG_LIGHT_SEC_BOOT_WITH_VERIFY_VAL_A) || \
-    defined(CONFIG_TARGET_LIGHT_FM_C910_VAL_A)
-#define ENV_STR_BOARD "board#=LA\0"
-#elif defined(CONFIG_LIGHT_ANDROID_BOOT_IMAGE_VAL_B) || \
-      defined(CONFIG_LIGHT_SEC_BOOT_WITH_VERIFY_VAL_B) || \
-      defined(CONFIG_TARGET_LIGHT_FM_C910_VAL_B)
-#define ENV_STR_BOARD "board#=LB\0"
-#elif defined(CONFIG_LIGHT_ANDROID_BOOT_IMAGE_VAL_LPI4A) || \
-      defined(CONFIG_LIGHT_SEC_BOOT_WITH_VERIFY_LPI4A) || \
-      defined(CONFIG_TARGET_LIGHT_FM_C910_LPI4A) || \
-	  defined(CONFIG_LIGHT_SEC_BOOT_WITH_VERIFY_RVBOOK) || \
-	  defined(CONFIG_TARGET_LIGHT_FM_C910_RVBOOK)
+#define CONFIG_MISC_INIT_R
+
 #define ENV_STR_BOARD "board#=LP\0"
-#elif defined(CONFIG_LIGHT_ANDROID_BOOT_IMAGE_VAL_BEAGLE) || \
-      defined(CONFIG_TARGET_LIGHT_FM_C910_BEAGLE)
-#define ENV_STR_BOARD "board#=LG\0"
-#elif defined(CONFIG_LIGHT_ANDROID_BOOT_IMAGE_ANT_REF) || \
-      defined(CONFIG_LIGHT_SEC_BOOT_WITH_VERIFY_ANT_REF) || \
-      defined(CONFIG_TARGET_LIGHT_FM_C910_VAL_ANT_REF)
-#define ENV_STR_BOARD "board#=LD\0"
-#endif

-#if defined (CONFIG_LIGHT_SEC_BOOT_WITH_VERIFY_VAL_A)
 #define CONFIG_EXTRA_ENV_SETTINGS \
-	"splashimage=0x30000000\0" \
-	"splashpos=m,m\0" \
-	"fdt_high=0xffffffffffffffff\0" \
-    ENV_STR_BOARD \
-	"tf_addr=0x100000\0" \
+	"scriptaddr=0x00500000\0" \
+	"pxefile_addr_r=0x00600000\0" \
 	"dtb_addr=0x03800000\0" \
-	"kernel_addr=0x00200000\0" \
+	"fdt_addr_r=0x03800000\0" \
+	"fdtoverlay_addr_r=0x03700000\0" \
+	"kernel_addr_r=0x00200000\0" \
+	"ramdisk_addr_r=0x06000000\0" \
+	"boot_conf_addr_r=0xc0000000\0" \
 	"aon_ram_addr=0xffffef8000\0" \
 	"audio_ram_addr=0x32000000\0" \
 	"str_ram_addr=0xffe0000000\0" \
-	"fwaddr=0x10000000\0"\
-	"tee_addr=0x1c000000\0" \
-	"sec_upgrade_mode=0\0"\
-	"mmcdev=0\0" \
-	"mmcpart=c\0" \
-	"mmcbootpart=2\0" \
-	"mmcteepart=3\0" \
-	"mmcsbmetapart=5\0" \
-	"slot_suffix=a\0" \
-	"retries=5\0" \
-	ENV_KERNEL_LOGLEVEL \
-	"kdump_buf=180M\0" \
-	ENV_STR_BOOT_DELAY \
-	"sbmeta_security_level=1\0" \
-	"nvpart_name=" NV_PARTITION_NAME"\0" \
-	"uboot_version=0x0000000000000000\0"\
-	"tee_version=0x00000000\0"\
-	"tf_version=0x00000000\0"\
-	"sbmeta_version=0x00000000\0"\
-	"fdt_file=th1520-a-val-sec.dtb\0" \
-	"uuid_rootfs=80a5a8e9-c744-491a-93c1-4f4194fd690b\0" \
-	"partitions=name=table,size=2031KB;name=boot_a,size=200MiB,type=boot;name=tee_a,size=36MiB,type=boot;name=stash,size=16MiB,type=boot;name=sbmeta_a,size=8MiB,type=boot;name=swap,size=1536MiB,type=boot;name=fastresume,size=512MiB,type=boot;name=${nvpart_name},size=1MiB;name=boot_b,size=200M,type=boot;name=tee_b,size=36M,type=boot;name=sbmeta_b,size=8M,type=boot;name=root,size=-,type=linux,uuid=${uuid_rootfs}\0" \
-	"finduuid=part uuid mmc ${mmcdev}:${mmcpart} uuid\0" \
-	"gpt_partition=gpt write mmc ${mmcdev} $partitions\0" \
-	ENV_PUBLIC_BOOTARGS \
-	"set_bootargs=setenv bootargs console=ttyS0,115200 root=PARTUUID=${uuid} ${pub_bootargs} loglevel=${kernel_loglevel} eth=$ethaddr crashkernel=${kdump_buf} ${resume_bootargs}\0" \
-	"load_aon=ext4load mmc ${mmcdev}:${mmcbootpart} $fwaddr light_aon_fpga.bin;cp.b $fwaddr $aon_ram_addr $filesize;bootaon\0"\
-	"load_c906_audio=ext4load mmc ${mmcdev}:${mmcbootpart} $fwaddr light_c906_audio.bin;cp.b $fwaddr $audio_ram_addr $filesize\0"\
-	"load_str=ext4load mmc ${mmcdev}:${mmcbootpart} $fwaddr str.bin;cp.b $fwaddr $str_ram_addr $filesize\0"\
-	"bootcmd_load=run load_aon;run load_c906_audio;ext4load mmc ${mmcdev}:${mmcteepart} $tf_addr trust_firmware.bin; ext4load mmc ${mmcdev}:${mmcteepart} $tee_addr tee.bin;ext4load mmc ${mmcdev}:${mmcbootpart} $dtb_addr ${fdt_file}; ext4load mmc ${mmcdev}:${mmcbootpart} $kernel_addr Image\0" \
-	"bootcmd=light_bootab;run bootcmd_load; chk_hibernate; fixup_memory_region; bootslave; run finduuid; run set_bootargs; sbmetaboot; measureboot;run load_str;booti $kernel_addr - $dtb_addr;\0" \
-        "\0"
-
-#elif defined (CONFIG_LIGHT_SEC_BOOT_WITH_VERIFY_VAL_B)
-#define CONFIG_EXTRA_ENV_SETTINGS \
+	"opensbi_addr=0x0\0" \
+	"fwaddr=0x10000000\0" \
 	"splashimage=0x30000000\0" \
 	"splashpos=m,m\0" \
 	"fdt_high=0xffffffffffffffff\0" \
-    ENV_STR_BOARD \
-	"tf_addr=0x100000\0" \
-	"dtb_addr=0x03800000\0" \
-	"kernel_addr=0x00200000\0" \
-	"aon_ram_addr=0xffffef8000\0" \
-	"audio_ram_addr=0x32000000\0" \
-	"str_ram_addr=0xffe0000000\0" \
-	"fwaddr=0x10000000\0"\
-	"tee_addr=0x1c000000\0" \
-	"sec_upgrade_mode=0\0"\
-	"mmcdev=0\0" \
-	"mmcpart=a\0" \
-	"mmcbootpart=2\0" \
-	"mmcteepart=3\0" \
-	"mmcsbmetapart=5\0" \
-	"slot_suffix=a\0" \
-	"retries=5\0" \
-	ENV_KERNEL_LOGLEVEL \
-	"kdump_buf=180M\0" \
-	ENV_STR_BOOT_DELAY \
-	"sbmeta_security_level=1\0" \
-	"nvpart_name=" NV_PARTITION_NAME"\0" \
-	"uboot_version=0x0000000000000000\0"\
-	"tee_version=0x00000000\0"\
-	"tf_version=0x00000000\0"\
-	"sbmeta_version=0x00000000\0"\
-	"fdt_file=th1520-b-product-sec.dtb\0" \
-	"uuid_rootfs=80a5a8e9-c744-491a-93c1-4f4194fd690b\0" \
-	"partitions=name=table,size=2031KB;name=boot_a,size=200MiB,type=boot;name=tee_a,size=36MiB,type=boot;name=stash,size=16MiB,type=boot;name=sbmeta_a,size=8MiB,type=boot;name=${nvpart_name},size=1MiB;name=boot_b,size=200M,type=boot;name=tee_b,size=36M,type=boot;name=sbmeta_b,size=8M,type=boot;name=root,size=-,type=linux,uuid=${uuid_rootfs}\0" \
-	"finduuid=part uuid mmc ${mmcdev}:${mmcpart} uuid\0" \
-	"gpt_partition=gpt write mmc ${mmcdev} $partitions\0" \
-	ENV_PUBLIC_BOOTARGS \
-	"set_bootargs=setenv bootargs console=ttyS0,115200 root=PARTUUID=${uuid} ${pub_bootargs} loglevel=${kernel_loglevel} eth=$ethaddr crashkernel=${kdump_buf}\0" \
-	"load_aon=ext4load mmc ${mmcdev}:${mmcbootpart} $fwaddr light_aon_fpga.bin;cp.b $fwaddr $aon_ram_addr $filesize;bootaon\0"\
-	"load_c906_audio=ext4load mmc ${mmcdev}:${mmcbootpart} $fwaddr light_c906_audio.bin;cp.b $fwaddr $audio_ram_addr $filesize\0"\
-	"load_str=ext4load mmc ${mmcdev}:${mmcbootpart} $fwaddr str.bin;cp.b $fwaddr $str_ram_addr $filesize\0"\
-	"bootcmd_load=run load_aon;run load_c906_audio;ext4load mmc ${mmcdev}:${mmcteepart} $tf_addr trust_firmware.bin; ext4load mmc ${mmcdev}:${mmcteepart} $tee_addr tee.bin;ext4load mmc ${mmcdev}:${mmcbootpart} $dtb_addr ${fdt_file}; ext4load mmc ${mmcdev}:${mmcbootpart} $kernel_addr Image\0" \
-	"bootcmd=light_bootab;run bootcmd_load; fixup_memory_region; bootslave; run finduuid; run set_bootargs; sbmetaboot; run load_str;booti $kernel_addr - $dtb_addr;\0" \
-        "\0"
-
-#elif defined (CONFIG_LIGHT_SEC_BOOT_WITH_VERIFY_ANT_REF)
-#define CONFIG_EXTRA_ENV_SETTINGS \
-	"splashimage=0x30000000\0" \
-	"splashpos=m,m\0" \
-	"fdt_high=0xffffffffffffffff\0" \
-    ENV_STR_BOARD \
-	"tf_addr=0x100000\0" \
-	"dtb_addr=0x03800000\0" \
-	"kernel_addr=0x00200000\0" \
-	"aon_ram_addr=0xffffef8000\0" \
-	"audio_ram_addr=0x32000000\0" \
-	"str_ram_addr=0xffe0000000\0" \
-	"fwaddr=0x10000000\0"\
-	"tee_addr=0x1c000000\0" \
-	"sec_upgrade_mode=0\0"\
-	"mmcdev=0\0" \
-	"mmcpart=6\0" \
-	"mmcbootpart=2\0" \
-	ENV_KERNEL_LOGLEVEL \
-	"kdump_buf=180M\0" \
-	ENV_STR_BOOT_DELAY \
-	"uboot_version=0x0000000000000000\0"\
-	"tee_version=0x00000000\0"\
-	"tf_version=0x00000000\0"\
-	"fdt_file=th1520-ant-ref-sec.dtb\0" \
-	"uuid_rootfs=80a5a8e9-c744-491a-93c1-4f4194fd690b\0" \
-	"partitions=name=table,size=2031KB;name=boot,size=200MiB,type=boot;name=tf,size=50MiB,type=boot;name=tee,size=50MiB,type=boot;name=stash,size=50MiB,type=boot;name=root,size=-,type=linux,uuid=${uuid_rootfs}\0" \
-	"finduuid=part uuid mmc ${mmcdev}:${mmcpart} uuid\0" \
-	"gpt_partition=gpt write mmc ${mmcdev} $partitions\0" \
-	ENV_PUBLIC_BOOTARGS \
-	"set_bootargs=setenv bootargs console=ttyS0,115200 root=PARTUUID=${uuid} ${pub_bootargs} loglevel=${kernel_loglevel} eth=$ethaddr crashkernel=${kdump_buf}\0" \
-	"load_aon=ext4load mmc ${mmcdev}:${mmcbootpart} $fwaddr light_aon_fpga.bin;cp.b $fwaddr $aon_ram_addr $filesize;bootaon\0"\
-	"load_c906_audio=ext4load mmc ${mmcdev}:${mmcbootpart} $fwaddr light_c906_audio.bin;cp.b $fwaddr $audio_ram_addr $filesize\0"\
-	"load_str=ext4load mmc ${mmcdev}:${mmcbootpart} $fwaddr str.bin;cp.b $fwaddr $str_ram_addr $filesize\0"\
-	"bootcmd_load=run load_aon;run load_c906_audio;run load_str; ext4load mmc 0:3 $tf_addr trust_firmware.bin; ext4load mmc 0:4 $tee_addr tee.bin;ext4load mmc ${mmcdev}:${mmcbootpart} $dtb_addr ${fdt_file}; ext4load mmc ${mmcdev}:${mmcbootpart} $kernel_addr Image\0" \
-	"bootcmd=run bootcmd_load; fixup_memory_region; bootslave; run finduuid; run set_bootargs; secboot; booti $kernel_addr - $dtb_addr;\0" \
-        "\0"
-#elif defined (CONFIG_LIGHT_SEC_BOOT_WITH_VERIFY_RVBOOK)
-#define CONFIG_EXTRA_ENV_SETTINGS \
-        "splashimage=0x30000000\0" \
-        "splashpos=m,m\0" \
-        "fdt_high=0xffffffffffffffff\0" \
-    ENV_STR_BOARD \
-        "tf_addr=0x100000\0" \
-        "dtb_addr=0x03800000\0" \
-        "kernel_addr=0x00200000\0" \
-        "aon_ram_addr=0xffffef8000\0" \
-        "audio_ram_addr=0x32000000\0" \
-        "str_ram_addr=0xffe0000000\0" \
-        "fwaddr=0x10000000\0"\
-        "tee_addr=0x1c000000\0" \
-        "sec_upgrade_mode=0\0"\
-        "mmcdev=0\0" \
-        "mmcpart=c\0" \
-        "mmcbootpart=2\0" \
-        "mmcteepart=3\0" \
-        "mmcsbmetapart=5\0" \
-        "slot_suffix=a\0" \
-        "retries=5\0" \
-        ENV_KERNEL_LOGLEVEL \
-        "sbmeta_security_level=1\0" \
-        "nvpart_name=" NV_PARTITION_NAME"\0" \
-        "kdump_buf=180M\0" \
-        ENV_STR_BOOT_DELAY \
-        "uboot_version=0x0000000000000000\0"\
-        "tee_version=0x00000000\0"\
-        "tf_version=0x00000000\0"\
-        "sbmeta_version=0x00000000\0"\
-        "fdt_file=th1520-rvbook-product-sec.dtb\0" \
-        "uuid_rootfs=80a5a8e9-c744-491a-93c1-4f4194fd690b\0" \
-        "partitions=name=table,size=2031KB;name=boot_a,size=200MiB,type=boot;name=tee_a,size=36MiB,type=boot;name=stash,size=16MiB,type=boot;name=sbmeta_a,size=8MiB,type=boot;name=swap,size=1536MiB,type=boot;name=fastresume,size=512MiB,type=boot;name=${nvpart_name},size=1MiB;name=boot_b,size=200M,type=boot;name=tee_b,size=36M,type=boot;name=sbmeta_b,size=8M,type=boot;name=root,size=-,type=linux,uuid=${uuid_rootfs}\0" \
-        "finduuid=part uuid mmc ${mmcdev}:${mmcpart} uuid\0" \
-        "gpt_partition=gpt write mmc ${mmcdev} $partitions\0" \
-        ENV_PUBLIC_BOOTARGS \
-        "set_bootargs=setenv bootargs console=ttyS0,115200 root=PARTUUID=${uuid} ${pub_bootargs} loglevel=${kernel_loglevel} eth=$ethaddr crashkernel=${kdump_buf} ${resume_bootargs}\0" \
-        "load_aon=ext4load mmc ${mmcdev}:${mmcbootpart} $fwaddr light_aon_fpga.bin;cp.b $fwaddr $aon_ram_addr $filesize;bootaon\0"\
-        "load_c906_audio=ext4load mmc ${mmcdev}:${mmcbootpart} $fwaddr light_c906_audio.bin;cp.b $fwaddr $audio_ram_addr $filesize\0"\
-        "load_str=ext4load mmc ${mmcdev}:${mmcbootpart} $fwaddr str.bin;cp.b $fwaddr $str_ram_addr $filesize\0"\
-        "bootcmd_load=run load_aon;run load_c906_audio;ext4load mmc ${mmcdev}:${mmcteepart} $tf_addr trust_firmware.bin; ext4load mmc ${mmcdev}:${mmcteepart} $tee_addr tee.bin;ext4load mmc ${mmcdev}:${mmcbootpart} $dtb_addr ${fdt_file}; ext4load mmc ${mmcdev}:${mmcbootpart} $kernel_addr Image\0" \
-        "bootcmd=light_bootab;run bootcmd_load; chk_hibernate; fixup_memory_region; bootslave; run finduuid; run set_bootargs; sbmetaboot; run load_str;booti $kernel_addr - $dtb_addr;\0" \
-        "\0"
-
-#elif defined (CONFIG_LIGHT_SEC_BOOT_WITH_VERIFY_LPI4A)
-#define CONFIG_EXTRA_ENV_SETTINGS \
-	"splashimage=0x30000000\0" \
-	"splashpos=m,m\0" \
-	"fdt_high=0xffffffffffffffff\0" \
-    ENV_STR_BOARD \
-	"tf_addr=0x100000\0" \
-	"dtb_addr=0x03800000\0" \
-	"kernel_addr=0x00200000\0" \
-	"aon_ram_addr=0xffffef8000\0" \
-	"audio_ram_addr=0x32000000\0" \
-	"str_ram_addr=0xffe0000000\0" \
-	"fwaddr=0x10000000\0"\
-	"tee_addr=0x1c000000\0" \
-	"sec_upgrade_mode=0\0"\
-	"mmcdev=0\0" \
-	"mmcpart=c\0" \
-	"mmcbootpart=2\0" \
-	"mmcteepart=3\0" \
-	"mmcsbmetapart=5\0" \
-	"slot_suffix=a\0" \
-	"retries=5\0" \
-	ENV_KERNEL_LOGLEVEL \
-	"sbmeta_security_level=1\0" \
-	"nvpart_name=" NV_PARTITION_NAME"\0" \
-	"kdump_buf=180M\0" \
-	ENV_STR_BOOT_DELAY \
-	"uboot_version=0x0000000000000000\0"\
-	"tee_version=0x00000000\0"\
-	"tf_version=0x00000000\0"\
-	"sbmeta_version=0x00000000\0"\
-	"fdt_file=th1520-lpi4a-product-sec.dtb\0" \
-	"uuid_rootfs=80a5a8e9-c744-491a-93c1-4f4194fd690b\0" \
-	"partitions=name=table,size=2031KB;name=boot_a,size=200MiB,type=boot;name=tee_a,size=36MiB,type=boot;name=stash,size=16MiB,type=boot;name=sbmeta_a,size=8MiB,type=boot;name=swap,size=1536MiB,type=boot;name=fastresume,size=512MiB,type=boot;name=${nvpart_name},size=1MiB;name=boot_b,size=200M,type=boot;name=tee_b,size=36M,type=boot;name=sbmeta_b,size=8M,type=boot;name=root,size=-,type=linux,uuid=${uuid_rootfs}\0" \
-	"finduuid=part uuid mmc ${mmcdev}:${mmcpart} uuid\0" \
-	"gpt_partition=gpt write mmc ${mmcdev} $partitions\0" \
-	ENV_PUBLIC_BOOTARGS \
-	"set_bootargs=setenv bootargs console=ttyS0,115200 root=PARTUUID=${uuid} ${pub_bootargs} loglevel=${kernel_loglevel} eth=$ethaddr crashkernel=${kdump_buf} ${resume_bootargs}\0" \
-	"load_aon=ext4load mmc ${mmcdev}:${mmcbootpart} $fwaddr light_aon_fpga.bin;cp.b $fwaddr $aon_ram_addr $filesize;bootaon\0"\
-	"load_c906_audio=ext4load mmc ${mmcdev}:${mmcbootpart} $fwaddr light_c906_audio.bin;cp.b $fwaddr $audio_ram_addr $filesize\0"\
-	"load_str=ext4load mmc ${mmcdev}:${mmcbootpart} $fwaddr str.bin;cp.b $fwaddr $str_ram_addr $filesize\0"\
-	"bootcmd_load=run load_aon;run load_c906_audio;ext4load mmc ${mmcdev}:${mmcteepart} $tf_addr trust_firmware.bin; ext4load mmc ${mmcdev}:${mmcteepart} $tee_addr tee.bin;ext4load mmc ${mmcdev}:${mmcbootpart} $dtb_addr ${fdt_file}; ext4load mmc ${mmcdev}:${mmcbootpart} $kernel_addr Image\0" \
-	"bootcmd=light_bootab;run bootcmd_load; chk_hibernate; fixup_memory_region; bootslave; run finduuid; run set_bootargs; sbmetaboot; run load_str;booti $kernel_addr - $dtb_addr;\0" \
-        "\0"
-
-#elif defined(CONFIG_LIGHT_ANDROID_BOOT_IMAGE_VAL_A) || defined(CONFIG_LIGHT_ANDROID_BOOT_IMAGE_VAL_B) || \
-      defined(CONFIG_LIGHT_ANDROID_BOOT_IMAGE_VAL_LPI4A) || defined(CONFIG_LIGHT_ANDROID_BOOT_IMAGE_VAL_BEAGLE) || \
-      defined(CONFIG_LIGHT_ANDROID_BOOT_IMAGE_ANT_REF)
-#define CONFIG_EXTRA_ENV_SETTINGS \
-	"splashimage=0x30000000\0" \
-	"splashpos=m,m\0" \
-	"fdt_high=0xffffffffffffffff\0" \
-	ENV_STR_SERIAL \
 	ENV_STR_BOARD \
-	"tf_addr=0x0\0" \
-	"tee_addr=0x1c000000\0" \
-	"opensbi_addr=0x0\0" \
-	"dtb_addr=0x03800000\0" \
-	"kernel_addr=0x00200000\0" \
-	"ramdisk_addr=0x02000000\0" \
-	"aon_ram_addr=0xffffef8000\0" \
-	"audio_ram_addr=0x32000000\0" \
-	"fwaddr=0x10000000\0"\
-	"boot_ab=_a\0"\
-	"sb_emulater=1\0"\
-	"mmcdev=0\0" \
-	"mmcpart=3\0" \
+	"kernel_addr_r=0x00200000\0" \
+	"kdump_buf=180M\0" \
 	"mmcbootpart=2\0" \
-	"mmcteepart=8\0" \
-	ENV_KERNEL_LOGLEVEL \
-	ENV_KERNEL_KDUMP \
-	ENV_STR_BOOT_DELAY \
-	"fdt_file=light-val.dtb\0" \
-	"uuid_rootfs=80a5a8e9-c744-491a-93c1-4f4194fd690b\0" \
-	"partitions=name=sparse,size=2031kb;name=bootpart_a,size=16MiB;name=bootpart_b,size=16MiB;name=boot_a,size=32MiB;name=boot_b,size=32MiB;name=vendor_boot_a,size=32MiB;name=vendor_boot_b,size=32MiB;name=tee_a,size=32MiB;name=tee_b,size=32MiB;name=dtbo_a,size=8MiB;name=dtbo_b,size=8MiB;name=super,size=4096MiB;name=vbmeta_a,size=1MiB;name=vbmeta_b,size=1MiB;name=vbmeta_system_a,size=1MiB;name=vbmeta_system_b,size=1MiB;name=misc,size=2MiB;name=metadata,size=16MiB;name=userdata,size=-\0" \
-	"finduuid=part uuid mmc ${mmcdev}:${mmcpart} uuid\0" \
-	"gpt_partition=gpt write mmc ${mmcdev} $partitions\0" \
-	"set_bootargs=setenv bootargs console=ttyS0,115200 earlycon clk_ignore_unused loop.max_part=7 loglevel=${kernel_loglevel} crashkernel=${kdump_buf} init=/init bootconfig video=HDMI-A-1:800x600-32@60 firmware_class.path=/vendor/firmware androidboot.serialno=${serial#}\0" \
-	"load_aon=ext4load mmc ${mmcdev}:${mmcbootpart} $fwaddr light_aon_fpga.bin;cp.b $fwaddr $aon_ram_addr $filesize;bootaon\0"\
-	"load_c906_audio=ext4load mmc ${mmcdev}:${mmcbootpart} $fwaddr light_c906_audio.bin;cp.b $fwaddr $audio_ram_addr $filesize\0"\
-	"sec_m_load=ext4load mmc ${mmcdev}:${mmcbootpart} $opensbi_addr fw_dynamic.bin\0"\
-	"bootcmd_load=bootandroid;secimg_load;run sec_m_load;run load_aon;run load_c906_audio;fdt addr ${dtb_addr};fdt resize 100;fdt chosen;\0" \
-	"bootcmd=run bootcmd_load; fixup_memory_region; bootslave; run finduuid; run set_bootargs; bootm $kernel_addr $ramdisk_addr:$ramdisk_size $dtb_addr;\0" \
-         "\0"
+	"default_mmcdev=1\0" \
+	"emmc_dev=0\0" \
+	"sdcard_dev=1\0" \
+	"mmc_select=if test -e mmc ${default_mmcdev}:${mmcbootpart} ${boot_conf_file}; then mmcdev=1; else mmcdev=0; fi;\0" \
+	"boot_conf_file=/extlinux/extlinux.conf\0" \
+	"uuid_rootfsA=80a5a8e9-c744-491a-93c1-4f4194fd690a\0" \
+	"uuid_swap=5ebcaaf0-e098-43b9-beef-1f8deedd135e\0" \
+	"partitions=name=table,size=2031KB;name=boot,size=500MiB,type=boot;name=swap,size=4096MiB,type=swap,uuid=${uuid_swap};name=root,size=-,type=linux,uuid=${uuid_rootfsA}\0" \
+	"gpt_partition=gpt write mmc ${emmc_dev} $partitions\0" \
+	"sdcard_gpt_partition=gpt write mmc ${sdcard_dev} $partitions\0" \
+	"load_aon=load mmc ${mmcdev}:${mmcbootpart} $fwaddr light_aon_fpga.bin;cp.b $fwaddr $aon_ram_addr $filesize;bootaon\0" \
+	"load_c906_audio=load mmc ${mmcdev}:${mmcbootpart} $fwaddr light_c906_audio.bin;cp.b $fwaddr $audio_ram_addr $filesize\0" \
+	"load_str=load mmc ${mmcdev}:${mmcbootpart} $fwaddr str.bin;cp.b $fwaddr $str_ram_addr $filesize\0" \
+	"load_opensbi=load mmc ${mmcdev}:${mmcbootpart} $opensbi_addr fw_dynamic.bin\0" \
+	"bootcmd_load=run mmc_select; run load_aon; run load_c906_audio; run load_str; run load_opensbi\0" \
+	"bootcmd=run bootcmd_load; chk_hibernate; fixup_memory_region; bootslave; sysboot mmc ${mmcdev}:${mmcbootpart} any $boot_conf_addr_r $boot_conf_file;\0" \
+	"fdtfile=" CONFIG_DEFAULT_FDT_FILE "\0" \
+	"\0"

-#else
-#if defined (CONFIG_TARGET_LIGHT_FM_C910_VAL_A)
-#define CONFIG_EXTRA_ENV_SETTINGS \
-	"splashimage=0x30000000\0" \
-	"splashpos=m,m\0" \
-	"fdt_high=0xffffffffffffffff\0" \
-	"opensbi_addr=0x0\0" \
-	"dtb_addr=0x03800000\0" \
-	"kernel_addr=0x00200000\0" \
-	"aon_ram_addr=0xffffef8000\0" \
-	"audio_ram_addr=0x32000000\0" \
-	"str_ram_addr=0xffe0000000\0" \
-	"fwaddr=0x10000000\0"\
-    ENV_STR_BOARD \
-	"mmcdev=0\0" \
-	"mmcpart=5\0" \
-	"mmcbootpart=2\0" \
-	ENV_KERNEL_LOGLEVEL \
-	"kdump_buf=180M\0" \
-	ENV_STR_BOOT_DELAY \
-	"fdt_file=th1520-a-product.dtb\0" \
-	"uuid_rootfs=80a5a8e9-c744-491a-93c1-4f4194fd690b\0" \
-	"partitions=name=table,size=2031KB;name=boot,size=200MiB,type=boot;name=swap,size=1536MiB,type=boot;name=fastresume,size=512MiB,type=boot;name=root,size=-,type=linux,uuid=${uuid_rootfs}\0" \
-	"finduuid=part uuid mmc ${mmcdev}:${mmcpart} uuid\0" \
-	"gpt_partition=gpt write mmc ${mmcdev} $partitions\0" \
-	ENV_PUBLIC_BOOTARGS \
-	"set_bootargs=setenv bootargs console=ttyS0,115200 root=PARTUUID=${uuid} ${pub_bootargs} loglevel=${kernel_loglevel} eth=$ethaddr crashkernel=${kdump_buf} ${resume_bootargs}\0" \
-	"load_aon=ext4load mmc 0:2 $fwaddr light_aon_fpga.bin;cp.b $fwaddr $aon_ram_addr $filesize;bootaon\0"\
-	"load_c906_audio=ext4load mmc 0:2 $fwaddr light_c906_audio.bin;cp.b $fwaddr $audio_ram_addr $filesize\0"\
-	"load_str=ext4load mmc ${mmcdev}:${mmcbootpart} $fwaddr str.bin;cp.b $fwaddr $str_ram_addr $filesize\0"\
-	"bootcmd_load=run load_aon;run load_c906_audio; run load_str; ext4load mmc 0:2 $opensbi_addr fw_dynamic.bin; ext4load mmc 0:2 $dtb_addr ${fdt_file}; ext4load mmc 0:2 $kernel_addr Image\0" \
-	"bootcmd=run bootcmd_load; bootslave; run finduuid; run set_bootargs; booti $kernel_addr - $dtb_addr;\0" \
-        "\0"
-#elif defined (CONFIG_TARGET_LIGHT_FM_C910_VAL_B)
-#define CONFIG_EXTRA_ENV_SETTINGS \
-	"splashimage=0x30000000\0" \
-	"splashpos=m,m\0" \
-	"fdt_high=0xffffffffffffffff\0" \
-	"opensbi_addr=0x0\0" \
-	"dtb_addr=0x03800000\0" \
-	"kernel_addr=0x00200000\0" \
-	"aon_ram_addr=0xffffef8000\0" \
-	"audio_ram_addr=0x32000000\0" \
-	"str_ram_addr=0xffe0000000\0" \
-	"fwaddr=0x10000000\0"\
-	"mmcdev=0\0" \
-	"mmcpart=3\0" \
-	"mmcbootpart=2\0" \
-	ENV_KERNEL_LOGLEVEL \
-	"kdump_buf=180M\0" \
-	ENV_STR_BOOT_DELAY \
-	"fdt_file=th1520-b-product.dtb\0" \
-	"uuid_rootfs=80a5a8e9-c744-491a-93c1-4f4194fd690b\0" \
-	"partitions=name=table,size=2031KB;name=boot,size=200MiB,type=boot;name=root,size=-,type=linux,uuid=${uuid_rootfs}\0" \
-	"finduuid=part uuid mmc ${mmcdev}:${mmcpart} uuid\0" \
-	"gpt_partition=gpt write mmc ${mmcdev} $partitions\0" \
-	ENV_PUBLIC_BOOTARGS \
-	"set_bootargs=setenv bootargs console=ttyS0,115200 root=PARTUUID=${uuid} ${pub_bootargs} loglevel=${kernel_loglevel} eth=$ethaddr crashkernel=${kdump_buf}\0" \
-	"load_aon=ext4load mmc ${mmcdev}:${mmcbootpart} $fwaddr light_aon_fpga.bin;cp.b $fwaddr $aon_ram_addr $filesize;bootaon\0"\
-	"load_c906_audio=ext4load mmc ${mmcdev}:${mmcbootpart} $fwaddr light_c906_audio.bin;cp.b $fwaddr $audio_ram_addr $filesize\0"\
-	"load_str=ext4load mmc ${mmcdev}:${mmcbootpart} $fwaddr str.bin;cp.b $fwaddr $str_ram_addr $filesize\0"\
-	"bootcmd_load=run load_aon;run load_c906_audio; run load_str; ext4load mmc ${mmcdev}:${mmcbootpart} $opensbi_addr fw_dynamic.bin; ext4load mmc ${mmcdev}:${mmcbootpart} $dtb_addr ${fdt_file};ext4load mmc ${mmcdev}:${mmcbootpart} $kernel_addr Image;\0" \
-	"bootcmd=run bootcmd_load; fixup_memory_region; bootslave ; run finduuid; run set_bootargs; booti $kernel_addr - $dtb_addr;\0" \
-        "\0"
-#elif defined (CONFIG_TARGET_LIGHT_FM_C910_B_REF)
-#define CONFIG_EXTRA_ENV_SETTINGS \
-	"splashimage=0x30000000\0" \
-	"splashpos=m,m\0" \
-	"fdt_high=0xffffffffffffffff\0" \
-	"opensbi_addr=0x0\0" \
-	"dtb_addr=0x03800000\0" \
-	"kernel_addr=0x00200000\0" \
-	"aon_ram_addr=0xffffef8000\0" \
-	"audio_ram_addr=0x32000000\0" \
-	"str_ram_addr=0xffe0000000\0" \
-	"fwaddr=0x10000000\0"\
-	"mmcdev=0\0" \
-	"mmcpart=3\0" \
-	"mmcbootpart=2\0" \
-	ENV_KERNEL_LOGLEVEL \
-	"kdump_buf=180M\0" \
-	ENV_STR_BOOT_DELAY \
-	"fdt_file=th1520-b-ref.dtb\0" \
-	"uuid_rootfs=80a5a8e9-c744-491a-93c1-4f4194fd690b\0" \
-	"partitions=name=table,size=2031KB;name=boot,size=200MiB,type=boot;name=root,size=-,type=linux,uuid=${uuid_rootfs}\0" \
-	"finduuid=part uuid mmc ${mmcdev}:${mmcpart} uuid\0" \
-	"gpt_partition=gpt write mmc ${mmcdev} $partitions\0" \
-	ENV_PUBLIC_BOOTARGS \
-	"set_bootargs=setenv bootargs console=ttyS0,115200 root=PARTUUID=${uuid} ${pub_bootargs} loglevel=${kernel_loglevel} eth=$ethaddr crashkernel=${kdump_buf}\0" \
-	"load_aon=ext4load mmc ${mmcdev}:${mmcbootpart} $fwaddr light_aon_fpga.bin;cp.b $fwaddr $aon_ram_addr $filesize;bootaon\0"\
-	"load_c906_audio=ext4load mmc ${mmcdev}:${mmcbootpart} $fwaddr light_c906_audio.bin;cp.b $fwaddr $audio_ram_addr $filesize\0"\
-	"load_str=ext4load mmc ${mmcdev}:${mmcbootpart} $fwaddr str.bin;cp.b $fwaddr $str_ram_addr $filesize\0"\
-	"bootcmd_load=run load_aon;run load_c906_audio; run load_str; ext4load mmc ${mmcdev}:${mmcbootpart} $opensbi_addr fw_dynamic.bin; ext4load mmc ${mmcdev}:${mmcbootpart} $dtb_addr ${fdt_file};ext4load mmc ${mmcdev}:${mmcbootpart} $kernel_addr Image;\0" \
-	"bootcmd=run bootcmd_load; bootslave ; run finduuid; run set_bootargs; booti $kernel_addr - $dtb_addr;\0" \
-        "\0"
-#elif defined (CONFIG_TARGET_LIGHT_FM_C910_B_POWER)
-#define CONFIG_EXTRA_ENV_SETTINGS \
-	"splashimage=0x30000000\0" \
-	"splashpos=m,m\0" \
-	"fdt_high=0xffffffffffffffff\0" \
-	"opensbi_addr=0x0\0" \
-	"dtb_addr=0x03800000\0" \
-	"kernel_addr=0x00200000\0" \
-	"aon_ram_addr=0xffffef8000\0" \
-	"audio_ram_addr=0x32000000\0" \
-	"str_ram_addr=0xffe0000000\0" \
-	"fwaddr=0x10000000\0"\
-	"mmcdev=0\0" \
-	"mmcpart=3\0" \
-	"mmcbootpart=2\0" \
-	ENV_KERNEL_LOGLEVEL \
-	"kdump_buf=180M\0" \
-	ENV_STR_BOOT_DELAY \
-	"fdt_file=th1520-b-power.dtb\0" \
-	"uuid_rootfs=80a5a8e9-c744-491a-93c1-4f4194fd690b\0" \
-	"partitions=name=table,size=2031KB;name=boot,size=200MiB,type=boot;name=root,size=-,type=linux,uuid=${uuid_rootfs}\0" \
-	"finduuid=part uuid mmc ${mmcdev}:${mmcpart} uuid\0" \
-	"gpt_partition=gpt write mmc ${mmcdev} $partitions\0" \
-	ENV_PUBLIC_BOOTARGS \
-	"set_bootargs=setenv bootargs console=ttyS0,115200 root=PARTUUID=${uuid} ${pub_bootargs} loglevel=${kernel_loglevel} eth=$ethaddr crashkernel=${kdump_buf}\0" \
-	"load_aon=ext4load mmc ${mmcdev}:${mmcbootpart} $fwaddr light_aon_fpga.bin;cp.b $fwaddr $aon_ram_addr $filesize;bootaon\0"\
-	"load_c906_audio=ext4load mmc ${mmcdev}:${mmcbootpart} $fwaddr light_c906_audio.bin;cp.b $fwaddr $audio_ram_addr $filesize\0"\
-	"load_str=ext4load mmc ${mmcdev}:${mmcbootpart} $fwaddr str.bin;cp.b $fwaddr $str_ram_addr $filesize\0"\
-	"bootcmd_load=run load_aon;run load_c906_audio; run load_str; ext4load mmc ${mmcdev}:${mmcbootpart} $opensbi_addr fw_dynamic.bin; ext4load mmc ${mmcdev}:${mmcbootpart} $dtb_addr ${fdt_file}; ext4load mmc ${mmcdev}:${mmcbootpart} $kernel_addr Image\0" \
-	"bootcmd=run bootcmd_load; bootslave; run finduuid; run set_bootargs; booti $kernel_addr - $dtb_addr;\0" \
-        "\0"
-#elif defined (CONFIG_TARGET_LIGHT_FM_C910_VAL_ANT_REF)
-#define CONFIG_EXTRA_ENV_SETTINGS \
-	"splashimage=0x30000000\0" \
-	"splashpos=m,m\0" \
-	"fdt_high=0xffffffffffffffff\0" \
-	"opensbi_addr=0x0\0" \
-	"dtb_addr=0x03800000\0" \
-	"kernel_addr=0x00200000\0" \
-	"aon_ram_addr=0xffffef8000\0" \
-	"audio_ram_addr=0x32000000\0" \
-	"str_ram_addr=0xffe0000000\0" \
-	"fwaddr=0x10000000\0"\
-	"mmcdev=0\0" \
-	"mmcpart=3\0" \
-	"mmcbootpart=2\0" \
-	ENV_KERNEL_LOGLEVEL \
-	"kdump_buf=180M\0" \
-	ENV_STR_BOOT_DELAY \
-	"fdt_file=th1520-ant-ref.dtb\0" \
-	"uuid_rootfs=80a5a8e9-c744-491a-93c1-4f4194fd690b\0" \
-	"partitions=name=table,size=2031KB;name=boot,size=200MiB,type=boot;name=root,size=-,type=linux,uuid=${uuid_rootfs}\0" \
-	"finduuid=part uuid mmc ${mmcdev}:${mmcpart} uuid\0" \
-	"gpt_partition=gpt write mmc ${mmcdev} $partitions\0" \
-	ENV_PUBLIC_BOOTARGS \
-	"set_bootargs=setenv bootargs console=ttyS0,115200 root=PARTUUID=${uuid} ${pub_bootargs} loglevel=${kernel_loglevel} eth=$ethaddr crashkernel=${kdump_buf}\0" \
-	"load_aon=ext4load mmc ${mmcdev}:${mmcbootpart} $fwaddr light_aon_fpga.bin;cp.b $fwaddr $aon_ram_addr $filesize;bootaon\0"\
-	"load_c906_audio=ext4load mmc ${mmcdev}:${mmcbootpart} $fwaddr light_c906_audio.bin;cp.b $fwaddr $audio_ram_addr $filesize\0"\
-	"load_str=ext4load mmc ${mmcdev}:${mmcbootpart} $fwaddr str.bin;cp.b $fwaddr $str_ram_addr $filesize\0"\
-	"bootcmd_load=run load_aon;run load_c906_audio; run load_str; ext4load mmc ${mmcdev}:${mmcbootpart} $opensbi_addr fw_dynamic.bin; ext4load mmc ${mmcdev}:${mmcbootpart} $dtb_addr ${fdt_file}; ext4load mmc ${mmcdev}:${mmcbootpart} $kernel_addr Image\0" \
-	"bootcmd=run bootcmd_load; fixup_memory_region; bootslave; run finduuid; run set_bootargs; booti $kernel_addr - $dtb_addr;\0" \
-        "\0"
-#elif defined (CONFIG_TARGET_LIGHT_FM_C910_VAL_ANT_DISCRETE)
-#define CONFIG_EXTRA_ENV_SETTINGS \
-	"splashimage=0x30000000\0" \
-	"splashpos=m,m\0" \
-	"fdt_high=0xffffffffffffffff\0" \
-	"opensbi_addr=0x0\0" \
-	"dtb_addr=0x03800000\0" \
-	"kernel_addr=0x00200000\0" \
-	"aon_ram_addr=0xffffef8000\0" \
-	"audio_ram_addr=0x32000000\0" \
-	"str_ram_addr=0xffe0000000\0" \
-	"fwaddr=0x10000000\0"\
-	"mmcdev=0\0" \
-	"mmcpart=3\0" \
-	"mmcbootpart=2\0" \
-	ENV_KERNEL_LOGLEVEL \
-	"kdump_buf=180M\0" \
-	ENV_STR_BOOT_DELAY \
-	"fdt_file=th1520-ant-discrete.dtb\0" \
-	"uuid_rootfs=80a5a8e9-c744-491a-93c1-4f4194fd690b\0" \
-	"partitions=name=table,size=2031KB;name=boot,size=200MiB,type=boot;name=root,size=-,type=linux,uuid=${uuid_rootfs}\0" \
-	"finduuid=part uuid mmc ${mmcdev}:${mmcpart} uuid\0" \
-	"gpt_partition=gpt write mmc ${mmcdev} $partitions\0" \
-	ENV_PUBLIC_BOOTARGS \
-	"set_bootargs=setenv bootargs console=ttyS0,115200 root=PARTUUID=${uuid} ${pub_bootargs} loglevel=${kernel_loglevel} eth=$ethaddr crashkernel=${kdump_buf}\0" \
-	"load_aon=ext4load mmc ${mmcdev}:${mmcbootpart} $fwaddr light_aon_fpga.bin;cp.b $fwaddr $aon_ram_addr $filesize;bootaon\0"\
-	"load_c906_audio=ext4load mmc ${mmcdev}:${mmcbootpart} $fwaddr light_c906_audio.bin;cp.b $fwaddr $audio_ram_addr $filesize\0"\
-	"load_str=ext4load mmc ${mmcdev}:${mmcbootpart} $fwaddr str.bin;cp.b $fwaddr $str_ram_addr $filesize\0"\
-	"bootcmd_load=run load_aon;run load_c906_audio; run load_str; ext4load mmc ${mmcdev}:${mmcbootpart} $opensbi_addr fw_dynamic.bin; ext4load mmc ${mmcdev}:${mmcbootpart} $dtb_addr ${fdt_file}; ext4load mmc ${mmcdev}:${mmcbootpart} $kernel_addr Image\0" \
-	"bootcmd=run bootcmd_load; bootslave; run finduuid; run set_bootargs; booti $kernel_addr - $dtb_addr;\0" \
-        "\0"
-#elif defined (CONFIG_TARGET_LIGHT_FM_C910_BEAGLE)
-#define CONFIG_EXTRA_ENV_SETTINGS \
-	"splashimage=0x30000000\0" \
-	"splashpos=m,m\0" \
-	"fdt_high=0xffffffffffffffff\0" \
-	"opensbi_addr=0x0\0" \
-	"dtb_addr=0x03800000\0" \
-	"kernel_addr=0x00200000\0" \
-	"aon_ram_addr=0xffffef8000\0" \
-	"audio_ram_addr=0x32000000\0" \
-	"str_ram_addr=0xffe0000000\0" \
-	"fwaddr=0x10000000\0"\
-	"mmcdev=0\0" \
-	"mmcpart=3\0" \
-	"mmcbootpart=2\0" \
-	ENV_KERNEL_LOGLEVEL \
-	"kdump_buf=180M\0" \
-	ENV_STR_BOOT_DELAY \
-	"fdt_file=th1520-beagle.dtb\0" \
-	"uuid_rootfs=80a5a8e9-c744-491a-93c1-4f4194fd690b\0" \
-	"partitions=name=table,size=2031KB;name=boot,size=200MiB,type=boot;name=root,size=-,type=linux,uuid=${uuid_rootfs}\0" \
-	"finduuid=part uuid mmc ${mmcdev}:${mmcpart} uuid\0" \
-	"gpt_partition=gpt write mmc ${mmcdev} $partitions\0" \
-	ENV_PUBLIC_BOOTARGS \
-	"set_bootargs=setenv bootargs console=ttyS0,115200 root=PARTUUID=${uuid} ${pub_bootargs} loglevel=${kernel_loglevel} eth=$ethaddr crashkernel=${kdump_buf}\0" \
-	"load_aon=ext4load mmc ${mmcdev}:${mmcbootpart} $fwaddr light_aon_fpga.bin;cp.b $fwaddr $aon_ram_addr $filesize;bootaon\0"\
-	"load_c906_audio=ext4load mmc ${mmcdev}:${mmcbootpart} $fwaddr light_c906_audio.bin;cp.b $fwaddr $audio_ram_addr $filesize\0"\
-	"load_str=ext4load mmc ${mmcdev}:${mmcbootpart} $fwaddr str.bin;cp.b $fwaddr $str_ram_addr $filesize\0"\
-	"bootcmd_load=run load_aon;run load_c906_audio; run load_str; ext4load mmc ${mmcdev}:${mmcbootpart} $opensbi_addr fw_dynamic.bin; ext4load mmc ${mmcdev}:${mmcbootpart} $dtb_addr ${fdt_file}; ext4load mmc ${mmcdev}:${mmcbootpart} $kernel_addr Image\0" \
-	"bootcmd=run bootcmd_load; fixup_memory_region; bootslave; run finduuid; run set_bootargs; booti $kernel_addr - $dtb_addr;\0" \
-        "\0"
-#elif defined (CONFIG_TARGET_LIGHT_FM_C910_RVBOOK)
-#define CONFIG_EXTRA_ENV_SETTINGS \
-	"splashimage=0x30000000\0" \
-	"splashpos=m,m\0" \
-	"fdt_high=0xffffffffffffffff\0" \
-	"opensbi_addr=0x0\0" \
-	"dtb_addr=0x03800000\0" \
-	"kernel_addr=0x00200000\0" \
-	"aon_ram_addr=0xffffef8000\0" \
-	"audio_ram_addr=0x32000000\0" \
-	"str_ram_addr=0xffe0000000\0" \
-	"fwaddr=0x10000000\0"\
-	"mmcdev=0\0" \
-	"mmcpart=5\0" \
-	"mmcbootpart=2\0" \
-	ENV_KERNEL_LOGLEVEL \
-	"kdump_buf=180M\0" \
-	ENV_STR_BOOT_DELAY \
-	"fdt_file=th1520-rvbook-product.dtb\0" \
-	"uuid_rootfs=80a5a8e9-c744-491a-93c1-4f4194fd690b\0" \
-	"partitions=name=table,size=2031KB;name=boot,size=200MiB,type=boot;name=swap,size=1536MiB,type=boot;name=fastresume,size=512MiB,type=boot;name=root,size=-,type=linux,uuid=${uuid_rootfs}\0" \
-	"finduuid=part uuid mmc ${mmcdev}:${mmcpart} uuid\0" \
-	"gpt_partition=gpt write mmc ${mmcdev} $partitions\0" \
-	ENV_PUBLIC_BOOTARGS \
-	"set_bootargs=setenv bootargs console=ttyS0,115200 root=PARTUUID=${uuid} ${pub_bootargs} loglevel=${kernel_loglevel} eth=$ethaddr crashkernel=${kdump_buf} ${resume_bootargs}\0" \
-	"load_aon=ext4load mmc ${mmcdev}:${mmcbootpart} $fwaddr light_aon_fpga.bin;cp.b $fwaddr $aon_ram_addr $filesize;bootaon\0"\
-	"load_c906_audio=ext4load mmc ${mmcdev}:${mmcbootpart} $fwaddr light_c906_audio.bin;cp.b $fwaddr $audio_ram_addr $filesize\0"\
-	"load_str=ext4load mmc ${mmcdev}:${mmcbootpart} $fwaddr str.bin;cp.b $fwaddr $str_ram_addr $filesize\0"\
-	"bootcmd_load=run load_aon;run load_c906_audio; run load_str; ext4load mmc ${mmcdev}:${mmcbootpart} $opensbi_addr fw_dynamic.bin; ext4load mmc ${mmcdev}:${mmcbootpart} $dtb_addr ${fdt_file}; ext4load mmc ${mmcdev}:${mmcbootpart} $kernel_addr Image\0" \
-	"bootcmd=run bootcmd_load; chk_hibernate; fixup_memory_region; bootslave; run finduuid; run set_bootargs; booti $kernel_addr - $dtb_addr;\0" \
-        "\0"
-#elif defined (CONFIG_TARGET_LIGHT_FM_C910_LPI4A)
-#define CONFIG_EXTRA_ENV_SETTINGS \
-	"splashimage=0x30000000\0" \
-	"splashpos=m,m\0" \
-	"fdt_high=0xffffffffffffffff\0" \
-	"opensbi_addr=0x0\0" \
-	"dtb_addr=0x03800000\0" \
-	"kernel_addr=0x00200000\0" \
-	"aon_ram_addr=0xffffef8000\0" \
-	"audio_ram_addr=0x32000000\0" \
-	"str_ram_addr=0xffe0000000\0" \
-	"fwaddr=0x10000000\0"\
-	"mmcdev=0\0" \
-	"mmcpart=5\0" \
-	"mmcbootpart=2\0" \
-	ENV_KERNEL_LOGLEVEL \
-	"kdump_buf=180M\0" \
-	ENV_STR_BOOT_DELAY \
-	"fdt_file=th1520-lpi4a-product.dtb\0" \
-	"uuid_rootfs=80a5a8e9-c744-491a-93c1-4f4194fd690b\0" \
-	"partitions=name=table,size=2031KB;name=boot,size=200MiB,type=boot;name=swap,size=1536MiB,type=boot;name=fastresume,size=512MiB,type=boot;name=root,size=-,type=linux,uuid=${uuid_rootfs}\0" \
-	"finduuid=part uuid mmc ${mmcdev}:${mmcpart} uuid\0" \
-	"gpt_partition=gpt write mmc ${mmcdev} $partitions\0" \
-	ENV_PUBLIC_BOOTARGS \
-	"set_bootargs=setenv bootargs console=ttyS0,115200 root=PARTUUID=${uuid} ${pub_bootargs} loglevel=${kernel_loglevel} eth=$ethaddr crashkernel=${kdump_buf} ${resume_bootargs}\0" \
-	"load_aon=ext4load mmc ${mmcdev}:${mmcbootpart} $fwaddr light_aon_fpga.bin;cp.b $fwaddr $aon_ram_addr $filesize;bootaon\0"\
-	"load_c906_audio=ext4load mmc ${mmcdev}:${mmcbootpart} $fwaddr light_c906_audio.bin;cp.b $fwaddr $audio_ram_addr $filesize\0"\
-	"load_str=ext4load mmc ${mmcdev}:${mmcbootpart} $fwaddr str.bin;cp.b $fwaddr $str_ram_addr $filesize\0"\
-	"bootcmd_load=run load_aon;run load_c906_audio; run load_str; ext4load mmc ${mmcdev}:${mmcbootpart} $opensbi_addr fw_dynamic.bin; ext4load mmc ${mmcdev}:${mmcbootpart} $dtb_addr ${fdt_file}; ext4load mmc ${mmcdev}:${mmcbootpart} $kernel_addr Image\0" \
-	"bootcmd=run bootcmd_load; chk_hibernate; fixup_memory_region; bootslave; run finduuid; run set_bootargs; booti $kernel_addr - $dtb_addr;\0" \
-        "\0"
-#elif defined (CONFIG_TARGET_LIGHT_FM_C910_A_REF)
-#define CONFIG_EXTRA_ENV_SETTINGS \
-	"splashimage=0x30000000\0" \
-	"splashpos=m,m\0" \
-	"fdt_high=0xffffffffffffffff\0" \
-	"opensbi_addr=0x0\0" \
-	"dtb_addr=0x03800000\0" \
-	"kernel_addr=0x00200000\0" \
-	"aon_ram_addr=0xffffef8000\0" \
-	"audio_ram_addr=0x32000000\0" \
-	"str_ram_addr=0xffe0000000\0" \
-	"fwaddr=0x10000000\0"\
-	"mmcdev=0\0" \
-	"mmcpart=3\0" \
-	"mmcbootpart=2\0" \
-	ENV_KERNEL_LOGLEVEL \
-	"kdump_buf=180M\0" \
-	ENV_STR_BOOT_DELAY \
-	"fdt_file=th1520-a-ref.dtb\0" \
-	"uuid_rootfs=80a5a8e9-c744-491a-93c1-4f4194fd690b\0" \
-	"partitions=name=table,size=2031KB;name=boot,size=200MiB,type=boot;name=root,size=-,type=linux,uuid=${uuid_rootfs}\0" \
-	"finduuid=part uuid mmc ${mmcdev}:${mmcpart} uuid\0" \
-	"gpt_partition=gpt write mmc ${mmcdev} $partitions\0" \
-	ENV_PUBLIC_BOOTARGS \
-	"set_bootargs=setenv bootargs console=ttyS0,115200 root=PARTUUID=${uuid} ${pub_bootargs} loglevel=${kernel_loglevel} eth=$ethaddr crashkernel=${kdump_buf}\0" \
-	"load_aon=ext4load mmc ${mmcdev}:${mmcbootpart} $fwaddr light_aon_fpga.bin;cp.b $fwaddr $aon_ram_addr $filesize;bootaon\0"\
-	"load_c906_audio=ext4load mmc ${mmcdev}:${mmcbootpart} $fwaddr light_c906_audio.bin;cp.b $fwaddr $audio_ram_addr $filesize\0"\
-	"load_str=ext4load mmc ${mmcdev}:${mmcbootpart} $fwaddr str.bin;cp.b $fwaddr $str_ram_addr $filesize\0"\
-	"bootcmd_load=run load_aon;run load_c906_audio; run load_str; ext4load mmc ${mmcdev}:${mmcbootpart} $opensbi_addr fw_dynamic.bin; ext4load mmc ${mmcdev}:${mmcbootpart} $dtb_addr ${fdt_file}; ext4load mmc ${mmcdev}:${mmcbootpart} $kernel_addr Image\0" \
-	"bootcmd=run bootcmd_load; bootslave; run finduuid; run set_bootargs; booti $kernel_addr - $dtb_addr;\0" \
-        "\0"
-#else
-#define CONFIG_EXTRA_ENV_SETTINGS \
-	"splashimage=0x30000000\0" \
-	"splashpos=m,m\0" \
-	"fdt_high=0xffffffffffffffff\0" \
-	"opensbi_addr=0x0\0" \
-	"dtb_addr=0x03800000\0" \
-	"kernel_addr=0x00200000\0" \
-	"aon_ram_addr=0xffffef8000\0" \
-	"audio_ram_addr=0x32000000\0" \
-	"str_ram_addr=0xffe0000000\0" \
-	"fwaddr=0x10000000\0"\
-	"mmcdev=0\0" \
-	"mmcpart=5\0" \
-	"mmcbootpart=2\0" \
-	ENV_KERNEL_LOGLEVEL \
-	"kdump_buf=180M\0" \
-	ENV_STR_BOOT_DELAY \
-	"fdt_file=th1520-a-val.dtb\0" \
-	"uuid_rootfs=80a5a8e9-c744-491a-93c1-4f4194fd690b\0" \
-	"partitions=name=table,size=2031KB;name=boot,size=200MiB,type=boot;name=swap,size=1536MiB,type=boot;name=fastresume,size=512MiB,type=boot;name=root,size=-,type=linux,uuid=${uuid_rootfs}\0" \
-	"finduuid=part uuid mmc ${mmcdev}:${mmcpart} uuid\0" \
-	"gpt_partition=gpt write mmc ${mmcdev} $partitions\0" \
-	ENV_PUBLIC_BOOTARGS \
-	"set_bootargs=setenv bootargs console=ttyS0,115200 root=PARTUUID=${uuid} ${pub_bootargs} loglevel=${kernel_loglevel} eth=$ethaddr crashkernel=${kdump_buf} ${resume_bootargs}\0" \
-	"load_aon=ext4load mmc ${mmcdev}:${mmcbootpart} $fwaddr light_aon_fpga.bin;cp.b $fwaddr $aon_ram_addr $filesize;bootaon\0"\
-	"load_c906_audio=ext4load mmc ${mmcdev}:${mmcbootpart} $fwaddr light_c906_audio.bin;cp.b $fwaddr $audio_ram_addr $filesize\0"\
-	"load_str=ext4load mmc ${mmcdev}:${mmcbootpart} $fwaddr str.bin;cp.b $fwaddr $str_ram_addr $filesize\0"\
-	"bootcmd_load=run load_aon;run load_c906_audio; run load_str; ext4load mmc ${mmcdev}:${mmcbootpart} $opensbi_addr fw_dynamic.bin; ext4load mmc ${mmcdev}:${mmcbootpart} $dtb_addr ${fdt_file}; ext4load mmc ${mmcdev}:${mmcbootpart} $kernel_addr Image\0" \
-	"bootcmd=run bootcmd_load; chk_hibernate; fixup_memory_region; bootslave; run finduuid; run set_bootargs; booti $kernel_addr - $dtb_addr;\0" \
-        "\0"
-#endif
-#endif
 #endif /* __CONFIG_H */
--- a/include/dm/uclass-id.h
+++ b/include/dm/uclass-id.h
@@ -115,12 +115,10 @@ enum uclass_id {
 	UCLASS_W1,		/* Dallas 1-Wire bus */
 	UCLASS_W1_EEPROM,	/* one-wire EEPROMs */
 	UCLASS_WDT,		/* Watchdog Timer driver */
-	UCLASS_FG,              /* Fuel gauge */
-	UCLASS_CHARGE_DISPLAY,  /* Charge display */
-	UCLASS_MCU,             /* MCU device */
-	#ifdef CONFIG_RV_BOOK
-	UCLASS_PD,              /* PD device */
-	#endif
+	UCLASS_FG,		/* Fuel gauge */
+	UCLASS_CHARGE_DISPLAY,	/* Charge display */
+	UCLASS_MCU,		/* MCU device */
+	UCLASS_PD,		/* PD device */
 	UCLASS_COUNT,
 	UCLASS_INVALID = -1,
 };
--- a/include/extension_board.h
+++ b/include/extension_board.h
@@ -0,0 +1,31 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
+/*
+ * (C) Copyright 2021
+ * Köry Maincent, Bootlin, <kory.maincent@bootlin.com>
+ */
+
+#ifndef __EXTENSION_SUPPORT_H
+#define __EXTENSION_SUPPORT_H
+
+struct extension {
+	struct list_head list;
+	char name[32];
+	char owner[32];
+	char version[32];
+	char overlay[32];
+	char other[32];
+};
+
+/**
+ * extension_board_scan - Add system-specific function to scan extension board.
+ * @param extension_list	List of extension board information to update.
+ * @return the number of extension.
+ *
+ * This function is called if CONFIG_CMD_EXTENSION is defined.
+ * Needs to fill the list extension_list with elements.
+ * Each element need to be allocated to an extension structure.
+ *
+ */
+int extension_board_scan(struct list_head *extension_list);
+
+#endif /* __EXTENSION_SUPPORT_H */
--- a/include/fastboot.h
+++ b/include/fastboot.h
@@ -15,17 +15,8 @@
 #define FASTBOOT_VERSION	"0.4"

 /* The 64 defined bytes plus \0 */
-#if CONFIG_FASTBOOT_CMD_OEM_NV_OPERATION
-#define FASTBOOT_COMMAND_LEN	(1024 + 1)
-#define FASTBOOT_RESPONSE_LEN	(1024 + 1)
-#else
 #define FASTBOOT_COMMAND_LEN	(64 + 1)
-#ifdef CONFIG_FASTBOOT_ECIES_AUTH
-#define FASTBOOT_RESPONSE_LEN	(1024 + 1)
-#else
 #define FASTBOOT_RESPONSE_LEN	(64 + 1)
-#endif
-#endif

 /**
 * All known commands to fastboot
@@ -58,11 +49,6 @@ enum {
 	FASTBOOT_COMMAND_UCMD,
 #endif
 	FASTBOOT_COMMAND_OEM_COMMAND,
-#if CONFIG_FASTBOOT_CMD_OEM_NV_OPERATION
-	FASTBOOT_COMMAND_OEM_NV_GET,
-	FASTBOOT_COMMAND_OEM_NV_SET,
-	FASTBOOT_COMMAND_OEM_FCTY,
-#endif

 	FASTBOOT_COMMAND_COUNT
 };
--- a/include/fdt_support.h
+++ b/include/fdt_support.h
@@ -326,6 +326,8 @@ int fdt_setup_simplefb_node(void *fdt, int node, u64 base_address, u32 width,

 int fdt_overlay_apply_verbose(void *fdt, void *fdto);

+int fdt_valid(struct fdt_header **blobp);
+
 /**
 * fdt_get_cells_len() - Get the length of a type of cell in top-level nodes
 *
--- a/lib/sec_library/include/aes.h
+++ b/lib/sec_library/include/aes.h
@@ -64,11 +64,9 @@ typedef enum{
    AES_MODE_CBC = 0x20000020,
    AES_MODE_CTR = 0x200001c0,
    AES_MODE_CFB = 0x20000400,
-    AES_MODE_GCM = 0x20020040,
-    AES_MODE_CCM = 0x207C0040,
+    AES_MODE_GCM = 0x20030040,
+    AES_MODE_CCM = 0x21D40040,
    AES_MODE_OFB = 0x24000000,
-    AES_MODE_XTS = 0x20001800,
-    AES_MODE_CBC_MAC = 0x2000800C,
 } csi_aes_mode_t;

 /**
@@ -84,16 +82,10 @@ typedef struct {
 */
 typedef struct {
    uint32_t            key_len_byte;
-    uint8_t             key[32];           /*Data block being processed*/
+    uint8_t             key[32];          /*Data block being processed*/
    uint32_t            sca;
    uint32_t            is_kdf;
    uint32_t            is_dma;
-    uint64_t            HH[16];
-    uint64_t            HL[16];
-    uint8_t             ctr[16];
-    uint8_t             buf[16];
-    uint32_t            origin_add_len;
-    uint32_t            origin_len;
 } csi_aes_context_t;

 /**
@@ -302,7 +294,7 @@ csi_error_t csi_aes_ctr_decrypt(csi_aes_t *aes,void *in,void *out,uint32_t size,
  \param[in]   iv               init vector
  \return      error code \ref csi_error_t
 */
-csi_error_t csi_aes_gcm_encrypt(csi_aes_t *aes, void *in, void *out, uint32_t size, uint32_t add_len, void *iv, void *tag);
+csi_error_t csi_aes_gcm_encrypt(csi_aes_t *aes, void *in, void *out,uint32_t size, uint32_t add_len, void *iv);

 /**
  \brief       Aes gcm decrypt
@@ -313,7 +305,7 @@ csi_error_t csi_aes_gcm_encrypt(csi_aes_t *aes, void *in, void *out, uint32_t si
  \param[in]   iv               init vecotr
  \return      error code \ref csi_error_t
 */
-csi_error_t csi_aes_gcm_decrypt(csi_aes_t *aes, void *in, void *out, uint32_t size, uint32_t add_len, void *iv, void *tag);
+csi_error_t csi_aes_gcm_decrypt(csi_aes_t *aes, void *in, void *out,uint32_t size, uint32_t add_len, void *iv);

 /**
  \brief       Aes ccm encrypt
@@ -325,7 +317,7 @@ csi_error_t csi_aes_gcm_decrypt(csi_aes_t *aes, void *in, void *out, uint32_t si
  \param[in]   tag_out          tag output
  \return      error code \ref csi_error_t
 */
-csi_error_t csi_aes_ccm_encrypt(csi_aes_t *aes, void *in, void *out, uint32_t size, uint32_t add_len, void *iv, void *tag);
+csi_error_t csi_aes_ccm_encrypt(csi_aes_t *aes, void *in, void *out,uint32_t size, uint32_t add_len, void *iv, uint8_t *tag_out);

 /**
  \brief       Aes ccm decrypt
@@ -337,7 +329,7 @@ csi_error_t csi_aes_ccm_encrypt(csi_aes_t *aes, void *in, void *out, uint32_t si
  \param[in]   tag_out          tag output
  \return      error code \ref csi_error_t
 */
-csi_error_t csi_aes_ccm_decrypt(csi_aes_t *aes, void *in, void *out, uint32_t size, uint32_t add_len, void *iv, void *tag);
+csi_error_t csi_aes_ccm_decrypt(csi_aes_t *aes, void *in, void *out,uint32_t size, uint32_t add_len, void *iv, uint8_t *tag_out);

 /**
  \brief       Enable AES power manage
@@ -355,55 +347,11 @@ void csi_aes_disable_pm(csi_aes_t *aes);

 /**
  \brief       Config AES data transfer mode
-  \param[in]   mode    \ref csi_des_trans_mode_t
+  \param[in]   mode    \ref csi_des_trans_mode_t 
  \return      None
 */
 csi_error_t csi_aes_trans_config(csi_aes_t *aes, csi_aes_trans_mode_t mode);

-/**
-  \brief       Aes xts encrypt
-  \param[in]   dev_aes              dev_aes handle to operate
-  \param[in]   in               Pointer to the Source data
-  \param[out]  out              Pointer to the Result data
-  \param[in]   size             the Source data size
-  \param[in]   iv               init vector
-  \param[in]   key2             XTS second key
-  \return      error code \ref csi_error_t
-*/
-csi_error_t csi_aes_xts_encrypt(csi_aes_t *aes, void *in, void *out, uint32_t size, void *iv, void *key2);
-
-/**
-  \brief       Aes xts decrypt
-  \param[in]   dev_aes              dev_aes handle to operate
-  \param[in]   in               Pointer to the Source data
-  \param[out]  out              Pointer to the Result data
-  \param[in]   size             the Source data size
-  \param[in]   iv               init vecotr
-  \param[in]   key2             XTS second key
-  \return      error code \ref csi_error_t
-*/
-csi_error_t csi_aes_xts_decrypt(csi_aes_t *aes, void *in, void *out, uint32_t size, void *iv, void *key2);
-
-/**
-  \brief       Aes cbc mac encrypt
-  \param[in]   dev_aes              dev_aes handle to operate
-  \param[in]   in               Pointer to the Source data
-  \param[in]   size             the Source data size
-  \param[out]  tag              tag output
-  \return      error code \ref csi_error_t
-*/
-csi_error_t csi_aes_cbc_mac_encrypt(csi_aes_t *aes, void *in, uint32_t size, void *tag);
-
-/**
-  \brief       Aes cbc mac decrypt
-  \param[in]   dev_aes              dev_aes handle to operate
-  \param[in]   in               Pointer to the Source data
-  \param[in]   size             the Source data size
-  \param[in]   tag              tag authen
-  \return      error code \ref csi_error_t
-*/
-csi_error_t csi_aes_cbc_mac_decrypt(csi_aes_t *aes, void *in, uint32_t size, void *tag);
-
 #ifdef __cplusplus
 }
 #endif
--- a/lib/sec_library/include/sec_crypto_aes.h
+++ b/lib/sec_library/include/sec_crypto_aes.h
@@ -27,10 +27,6 @@
 #include "crypto_aes.h"
 #endif

-#ifdef CONFIG_SEC_CRYPTO_GCM_SW
-#include "crypto_gcm.h"
-#endif
-
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -73,9 +69,6 @@ typedef struct {
 #if defined(CONFIG_SEC_CRYPTO_AES_SW)
    sc_mbedtls_aes_context aes_ctx;
 #endif
-#if defined(CONFIG_SEC_CRYPTO_GCM_SW)
-    mbedtls_gcm_context gcm_ctx;
-#endif
 } sc_aes_t;

 /*Function documentation*/
@@ -94,14 +87,6 @@ uint32_t sc_aes_init(sc_aes_t *aes, uint32_t idx);
 */
 void sc_aes_uninit(sc_aes_t *aes);

-/**
-  \brief       Aes data transfer config
-  \param[in]   aes    handle to operate
-  \param[in]   mode   \ref sc_aes_trans_mode_t
-  \return      error code \ref uint32_t
-*/
-uint32_t sc_aes_trans_config(sc_aes_t *aes, sc_aes_trans_mode_t mode);
-
 /**
  \brief       Set encrypt key
  \param[in]   aes        handle to operate
@@ -278,104 +263,53 @@ uint32_t sc_aes_ctr_decrypt(sc_aes_t *aes, void *in, void *out, uint32_t size,vo
 /**
  \brief       Aes gcm encrypt
  \param[in]   dev_aes          dev_aes handle to operate
-  \param[in]   in               Pointer to the Source data(add + plaintext, Add can be null, 
-                                Add and plaintext must be to an integer multiple of 16Byte)
+  \param[in]   in               Pointer to the Source data.
  \param[out]  out              Pointer to the Result data
-  \param[in]   size             the Source data true size
-  \param[in]   add_len          the Additional authenticated data true size
-  \param[in]   iv               Nonce(12Byte)
-  \param[out]  tag              tag output(16byte), parse null if not needed
+  \param[in]   size             the Source data size
+  \param[in]   iv               init vector
  \return      error code \ref csi_error_t
 */
-uint32_t sc_aes_gcm_encrypt(sc_aes_t *aes, void *in, void *out, uint32_t size, uint32_t add_len, void *iv, void* tag);
+uint32_t sc_aes_gcm_encrypt(sc_aes_t *aes, void *in, void *out,uint32_t size, uint32_t add_len, void *iv);

 /**
  \brief       Aes gcm decrypt
  \param[in]   dev_aes          dev_aes handle to operate
-  \param[in]   in               Pointer to the Source data
-  \param[in]   in               Pointer to the Source data(add + cipher, Add can be null, 
-                                Add and plaintext must be to an integer multiple of 16Byte)
-  \param[in]   size             the Source data true size
-  \param[in]   add_len          the Additional authenticated data true size
-  \param[in]   iv               Nonce(12Byte)
-  \param[in]   tag              tag authenticated(16byte), parse null if not needed
+  \param[in]   in               Pointer to the Source data.
+  \param[out]  out              Pointer to the Result data
+  \param[in]   size             the Source data size
+  \param[in]   iv               init vecotr
  \return      error code \ref csi_error_t
 */
-uint32_t sc_aes_gcm_decrypt(sc_aes_t *aes, void *in, void *out, uint32_t size, uint32_t add_len, void *iv, void* tag);
+uint32_t sc_aes_gcm_decrypt(sc_aes_t *aes, void *in, void *out,uint32_t size, uint32_t add_len, void *iv);

 /**
  \brief       Aes gcm encrypt
  \param[in]   dev_aes          dev_aes handle to operate
-  \param[in]   in               Pointer to the Source data(add + padding + plaintext + padding, Add can be null, 
-                                Add and plaintext must fill to an integer multiple of 16Byte with zero, 
-                                ignore this if the value is a multiple of 16)
+  \param[in]   in               Pointer to the Source data.
  \param[out]  out              Pointer to the Result data
-  \param[in]   size             the Source data true size
-  \param[in]   add_len          the Additional authenticated data true size
-  \param[in]   iv               Nonce(only support 7Byte)
-  \param[out]  tag              tag authenticated(onlt support 4Byte), parse null if not needed
+  \param[in]   size             the Source data size
+  \param[in]   iv               init vector
+  \param[in]   tag_out          tag output ,parse null if not needed
  \return      error code \ref csi_error_t
 */
-uint32_t sc_aes_ccm_encrypt(sc_aes_t *aes, void *in, void *out, uint32_t size, uint32_t add_len, void *iv, void* tag);
+uint32_t sc_aes_ccm_encrypt(sc_aes_t *aes, void *in, void *out,uint32_t size, uint32_t add_len, void *iv, uint8_t* tag_out);

 /**
  \brief       Aes gcm decrypt
  \param[in]   dev_aes          dev_aes handle to operate
-  \param[in]   in               Pointer to the Source data(add + padding + cipher + padding, Add can be null, 
-                                Add and cipher must fill to an integer multiple of 16 with zero, 
-                                ignore this if the value is a multiple of 16)
-  \param[out]  out              Pointer to the decrypted data
-  \param[in]   size             the Source data true size
-  \param[in]   add_len          the Additional authenticated data true size
-  \param[in]   iv               Nonce(only support 7Byte)
-  \param[in]   tag              tag authenticated(onlt support 4Byte), parse null if not needed
+  \param[in]   in               Pointer to the Source data.
+  \param[out]  out              Pointer to the Result data
+  \param[in]   size             the Source data size
+  \param[in]   iv               init vecotr
+  \param[in]   tag_out tag output,parse null if not needed
  \return      error code \ref csi_error_t
 */
-uint32_t sc_aes_ccm_decrypt(sc_aes_t *aes, void *in, void *out, uint32_t size, uint32_t add_len, void *iv, void* tag);
+uint32_t sc_aes_ccm_decrypt(sc_aes_t *aes, void *in, void *out,uint32_t size, uint32_t add_len, void *iv, uint8_t* tag_out);

 /**
-  \brief       Aes xts encrypt
-  \param[in]   aes              handle to operate
-  \param[in]   in               Pointer to the Source data
-  \param[out]  out              Pointer to the Result data
-  \param[in]   size             the Source data size
-  \param[in]   iv               init vecotr
-  \param[in]   key2             XTS Second key
-  \return      error code \ref uint32_t
+  \brief       Aes data transfer config
 */
-uint32_t sc_aes_xts_encrypt(sc_aes_t *aes, void *in, void *out, uint32_t size, void *iv, void *key2);
-
-/**
-  \brief       Aes xts decrypt
-  \param[in]   aes              handle to operate
-  \param[in]   in               Pointer to the Source data
-  \param[out]  out              Pointer to the Result data
-  \param[in]   size             the Source data size
-  \param[in]   iv               init vecotr
-  \param[in]   key2             XTS Second key
-  \return      error code \ref uint32_t
-*/
-uint32_t sc_aes_xts_decrypt(sc_aes_t *aes, void *in, void *out, uint32_t size, void *iv, void *key2);
-
-/**
-  \brief       Aes cbc mac encrypt
-  \param[in]   aes              handle to operate
-  \param[in]   in               Pointer to the Source data
-  \param[in]   size             the Source data size
-  \param[out]  tag              tag output
-  \return      error code \ref uint32_t
-*/
-uint32_t sc_aes_cbc_mac_encrypt(sc_aes_t *aes, void *in, uint32_t size, void *tag);
-
-/**
-  \brief       Aes cbc mac decrypt
-  \param[in]   aes              handle to operate
-  \param[in]   in               Pointer to the Source data
-  \param[in]   size             the Source data size
-  \param[in]   tag              tag authen
-  \return      error code \ref uint32_t
-*/
-uint32_t sc_aes_cbc_mac_decrypt(sc_aes_t *aes, void *in, uint32_t size, void *tag);
+uint32_t sc_aes_trans_config(sc_aes_t *aes, sc_aes_trans_mode_t mode) ;

 #ifdef __cplusplus
 }
--- a/lib/sec_library/include/sec_crypto_ecc.h
+++ b/lib/sec_library/include/sec_crypto_ecc.h
@@ -99,7 +99,7 @@ void sc_ecc_uninit(sc_ecc_t *ecc);
  \return      \ref uint32_t
 */
 uint32_t sc_ecc_config(sc_ecc_t *ecc, sc_ecc_cipher_order_e co,
-                    sc_ecc_endian_mode_e endian);
+                       sc_ecc_endian_mode_e endian);

 /**
  \brief       Attach the callback handler to ECC
@@ -124,7 +124,7 @@ uint32_t sc_ecc_detach_callback(sc_ecc_t *ecc);
 */
 uint32_t sc_ecc_get_capabilities(sc_ecc_t *ecc, sc_ecc_capabilities_t *cap);

-uint32_t sc_ecc_check_keypair(sc_ecc_t *ecc, uint8_t pubkey[64],
+uint32_t sc_ecc_check_keypair(sc_ecc_t *ecc, uint8_t pubkey[65],
                              uint8_t prikey[32]);

 /**
@@ -134,7 +134,7 @@ uint32_t sc_ecc_check_keypair(sc_ecc_t *ecc, uint8_t pubkey[64],
  \param[out]  public   Pointer to the ecc public key, alloc by caller.
  \return      \ref uint32_t
 */
-uint32_t sc_ecc_gen_key(sc_ecc_t *ecc, uint8_t pubkey[64], uint8_t prikey[32]);
+uint32_t sc_ecc_gen_key(sc_ecc_t *ecc, uint8_t pubkey[65], uint8_t prikey[32]);


 /**
@@ -144,7 +144,7 @@ uint32_t sc_ecc_gen_key(sc_ecc_t *ecc, uint8_t pubkey[64], uint8_t prikey[32]);
  \param[out]  pubkey   Pointer to the ecc public key, alloc by caller.
  \return      \ref uint32_t
 */
-uint32_t sc_ecc_gen_pubkey(sc_ecc_t *ecc, uint8_t pubkey[64],
+uint32_t sc_ecc_gen_pubkey(sc_ecc_t *ecc, uint8_t pubkey[65], 
                    uint8_t prikey[32], sc_ecc_curve_type type);

 /**
@@ -156,7 +156,7 @@ uint32_t sc_ecc_gen_pubkey(sc_ecc_t *ecc, uint8_t pubkey[64],
  \return      \ref uint32_t
 */
 uint32_t sc_ecc_sign(sc_ecc_t *ecc, uint8_t d[32], uint8_t prikey[32],
-                    uint8_t s[64], sc_ecc_curve_type type);
+                     uint8_t s[64], sc_ecc_curve_type type);

 /**
  \brief       ecc sign
@@ -167,7 +167,7 @@ uint32_t sc_ecc_sign(sc_ecc_t *ecc, uint8_t d[32], uint8_t prikey[32],
  \return      \ref uint32_t
 */
 uint32_t sc_ecc_sign_async(sc_ecc_t *ecc, uint8_t d[32], uint8_t prikey[32],
-                        uint8_t s[64], sc_ecc_curve_type type);
+                           uint8_t s[64], sc_ecc_curve_type type);

 /* TODO */
 /**
@@ -178,8 +178,8 @@ uint32_t sc_ecc_sign_async(sc_ecc_t *ecc, uint8_t d[32], uint8_t prikey[32],
  \param[out]  s Pointer to the signature
  \return      verify result
 */
-bool sc_ecc_verify(sc_ecc_t *ecc, uint8_t d[32], uint8_t pubkey[64],
-                uint8_t s[64], sc_ecc_curve_type type);
+bool sc_ecc_verify(sc_ecc_t *ecc, uint8_t d[32], uint8_t pubkey[65],
+                   uint8_t s[64], sc_ecc_curve_type type);

 /**
  \brief       ecc verify
@@ -189,8 +189,8 @@ bool sc_ecc_verify(sc_ecc_t *ecc, uint8_t d[32], uint8_t pubkey[64],
  \param[out]  s Pointer to the signature
  \return      verify result
 */
-bool sc_ecc_verify_async(sc_ecc_t *ecc, uint8_t d[32], uint8_t pubkey[64],
-                        uint8_t s[64], sc_ecc_curve_type type);
+bool sc_ecc_verify_async(sc_ecc_t *ecc, uint8_t d[32], uint8_t pubkey[65],
+                         uint8_t s[64], sc_ecc_curve_type type);

 /**
  \brief       ecc encrypto
@@ -203,7 +203,7 @@ bool sc_ecc_verify_async(sc_ecc_t *ecc, uint8_t d[32], uint8_t pubkey[64],
  \return      uint32_t
 */
 uint32_t sc_ecc_encrypt(sc_ecc_t *ecc, uint8_t *plain, uint32_t plain_len,
-                        uint8_t pubKey[64], uint8_t *cipher,
+                        uint8_t pubKey[65], uint8_t *cipher,
                        uint32_t *cipher_len);

 /**
@@ -237,7 +237,7 @@ uint32_t sc_ecc_exchangekey(sc_ecc_t *ecc, sc_ecc_exchange_role_e role,
  \return      uint32_t
 */
 uint32_t sc_ecc_getZ(sc_ecc_t *ecc, uint8_t *id, uint32_t id_len,
-                    uint8_t pubkey[65], uint8_t z[32]);
+                     uint8_t pubkey[65], uint8_t z[32]);

 /**
  \brief       ecc key exchange get E
@@ -245,7 +245,7 @@ uint32_t sc_ecc_getZ(sc_ecc_t *ecc, uint8_t *id, uint32_t id_len,
  \return      uint32_t
 */
 uint32_t sc_ecc_getE(sc_ecc_t *ecc, uint8_t *m, uint32_t len, uint8_t z[32],
-                    uint8_t e[32]);
+                     uint8_t e[32]);

 /**
  \brief       Get ECC state.
--- a/lib/sec_library/include/sec_crypto_ecdh.h
+++ b/lib/sec_library/include/sec_crypto_ecdh.h
@@ -1,104 +1,53 @@
 /*
- * Copyright (C) 2017-2023 Alibaba Group Holding Limited
+ * Copyright (C) 2017-2022 Alibaba Group Holding Limited
 */
 /******************************************************************************
- * @file     sec_crypt_ecdh.h
- * @brief    Header File for ECDH
- * @version  V1.0
- * @date     12. May 2023
+ * @file     sec_crypto_ecdh.h
+ * @brief    Header File for curve25519( a state-of-the-art Diffie-Hellman function)
+ * @version  V3.3
+ * @date     10. June 2022
 * @model    ecdh
 ******************************************************************************/
 #ifndef _SC_ECDH_H_
 #define _SC_ECDH_H_
+#include "sec_include_config.h"

-#include <stdint.h>
-#include <sec_crypto_errcode.h>
-#include <sec_crypto_ecdsa.h>
+#define CONFIG_SEC_CRYPTO_ECC

-#ifdef CONFIG_SYSTEM_SECURE
-#ifdef SEC_LIB_VERSION
-#include <drv/ecc.h>
-#else
-#include "ecc.h"
-#endif
-#endif
-
-#ifdef CONFIG_SEC_CRYPTO_ECC_SW
-#include "crypto_ecc_dsa.h"
-#endif
+#ifdef CONFIG_SEC_CRYPTO_ECC

 #ifdef __cplusplus
 extern "C" {
 #endif

-#define EC_SECP521R1_SECRET_KEY_LEN    32
-
-/**
-\brief ECDH Ctrl Block
-*/
-typedef struct {
-#ifdef CONFIG_SYSTEM_SECURE
-#ifdef CONFIG_CSI_V1
-    aes_handle_t  handle;
+#ifdef SEC_LIB_VERSION
+#include "drv/ecdh.h"
+#include "drv/ecc.h"
+#include "sec_crypto_ecc.h"
+#else
+#include "ecdh.h"
+#include "ecc.h"
+#include "sec_crypto_ecc.h"
 #endif
-#ifdef CONFIG_CSI_V2
-    // csi_ecdh_t   csi_ecdh;
-    csi_ecc_t   csi_ecdh;
-#endif
-#endif
-#if defined(CONFIG_TEE_CA)
-#endif
-#if defined(CONFIG_SEC_CRYPTO_ECC_SW)
-    uECC_Curve ecdh_ctx;
-#endif
-} sc_ecdh_t;
-
-// Function documentation
-/**
-  \brief       Initialize ECDH interface. Initializes the resources needed for the ECDH interface
-  \param[in]   ecdh   Handle to operate
-  \param[in]   idx    Device id
-  \return      Error code
-*/
-uint32_t sc_ecdh_init(sc_ecdh_t *ecdh, uint32_t idx);

 /**
-  \brief       De-initialize ECDH interface. Stops operation and releases the software resources used by the interface
-  \param[in]   ecdh    Dandle to operate
-  \return      None
+  \brief       ecdh calc secret
+  \param[in]   ecc ecc handle to operate.
+  \param[in]   pubkey  Pointer to the A(or B) public key.
+  \param[out]  privkey Pointer to the B(or A) private key.
+  \param[out]  out Pointer to the share secret.
+  \param[out]  len length of the share secret.
+  \return      \ref uint32_t.
 */
-void sc_ecdh_uninit(sc_ecdh_t *ecdh);

-/**
-  \brief       Load curve param to engin
-  \param[in]   ecdh      Handle to operate
-  \param[in]   type       Pointer to \ref sc_curve_type_t
-  \return      Error code
-*/
-uint32_t sc_ecdh_load_curve(sc_ecdh_t *ecdh, sc_curve_type_t type);
-
-/**
-  \brief       ECDH generate key pairs
-  \param[in]   ecdh        Handle to operate
-  \param[out]  privkey     Pointer to the private key buf
-  \param[out]  pubkey      Pointer to the public key buf
-  \return      Error code
-*/
-uint32_t sc_ecdh_gen_keypair(sc_ecdh_t *ecdh, uint8_t *prikey, uint8_t *pubkey);
-
-/**
-  \brief       ECDH ECDH generate secret key
-  \param[in]   ecdh        Handle to operate
-  \param[in]   privkey     Pointer to the private key buf of Alice
-  \param[in]   pubkey      Pointer to the public key buf of Bob
-  \param[out]  sk          Pointer to the secret key buf
-  \param[out]  sk_len      The secret key length
-  \return      Error code
-*/
-uint32_t sc_ecdh_calc_secret(sc_ecdh_t *ecdh, const uint8_t *privkey, const uint8_t *pubkey,
-                                uint8_t *sk, uint32_t *sk_len);
+uint32_t sc_ecdh_calc_secret(sc_ecc_t *ecc, uint8_t privkey[32],
+                            uint8_t pubkey[65], uint8_t out[32], 
+                            uint32_t *len, sc_ecc_curve_type type) ;

 #ifdef __cplusplus
 }
 #endif
-#endif /* _SC_ECDH_H_ */
+
+#endif
+
+#endif /* _SC_CURVE15519_H_ */
--- a/lib/sec_library/include/sec_crypto_ecdsa.h
+++ b/lib/sec_library/include/sec_crypto_ecdsa.h
@@ -1,120 +0,0 @@
-/*
- * Copyright (C) 2017-2023 Alibaba Group Holding Limited
- */
-/******************************************************************************
- * @file     seccrypt_ecdsa.h
- * @brief    Header File for ECDSA
- * @version  V1.0
- * @date     11. May 2023
- * @model    ecdsa
- ******************************************************************************/
-#ifndef _SC_ECDSA_H_
-#define _SC_ECDSA_H_
-
-#include <stdint.h>
-#include <sec_crypto_errcode.h>
-
-
-#ifdef CONFIG_SYSTEM_SECURE
-// #include "drv/ecdsa.h"
-#endif
-
-#ifdef CONFIG_SEC_CRYPTO_ECC_SW
-#include "crypto_ecc_dsa.h"
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-typedef enum {
-    SC_CURVES_SECP256K1 =  0U,	/* SECG curve over a 256 bit prime field */
-    SC_CURVES_SECP384R1, 		/* NIST/SECG curve over a 384 bit prime field */
-    SC_CURVES_SECP521R1, 		/* NIST/SECG curve over a 521 bit prime field */
-    SC_CURVES_BRAINPOOL256R1, 	/* RFC 5639 curve over a 256 prime field */
-    SC_CURVES_BRAINPOOL256T1, 	/* RFC 5639 curve over a 256 prime field */
-    SC_CURVES_BRAINPOOL512R1, 	/* RFC 5639 curve over a 512 prime field */
-    SC_CURVES_BRAINPOOL512T1, 	/* RFC 5639 curve over a 512 prime field */
-} sc_curve_type_t;
-
-#define EC_SECP521R1_PRIVATE_KEY_LEN  32
-#define EC_SECP521R1_PUBLIC_KEY_LEN   64
-#define EC_SECP521R1_DIGEST_LEN       32
-#define EC_SECP521R1_SIGNATURE_LEN    64
-
-/**
-\brief ECDSA Ctrl Block
-*/
-typedef struct {
-#ifdef CONFIG_SYSTEM_SECURE
-#ifdef CONFIG_CSI_V1
-    aes_handle_t  handle;
-#endif
-#ifdef CONFIG_CSI_V2
-    // csi_ecdsa_t   csi_ecdsa;
-#endif
-#endif
-#if defined(CONFIG_TEE_CA)
-#endif
-#if defined(CONFIG_SEC_CRYPTO_ECC_SW)
-    uECC_Curve ecdsa_ctx;
-#endif
-} sc_ecdsa_t;
-
-// Function documentation
-/**
-  \brief       Initialize ECDSA interface. Initializes the resources needed for the ECDSA interface
-  \param[in]   ecdsa    Handle to operate
-  \param[in]   idx    Device id
-  \return      Error code
-*/
-uint32_t sc_ecdsa_init(sc_ecdsa_t *ecdsa, uint32_t idx);
-
-/**
-  \brief       De-initialize ECDSA interface. Stops operation and releases the software resources used by the interface
-  \param[in]   ecdsa    Dandle to operate
-  \return      None
-*/
-void sc_ecdsa_uninit(sc_ecdsa_t *ecdsa);
-
-/**
-  \brief       Load curve param to engin
-  \param[in]   ecdsa      Handle to operate
-  \param[in]   type       Pointer to \ref csi_curve_type_t
-  \return      Error code
-*/
-uint32_t sc_ecdsa_load_curve(sc_ecdsa_t *ecdsa, sc_curve_type_t type);
-
-/**
-  \brief       Ecdsa Sign
-  \param[in]   ecdsa        Handle to operate
-  \param[in]   prikey       Pointer to the private key buf
-  \param[in]   prikey_len   The private key length
-  \param[in]   dgst         Pointer to the digest buf
-  \param[in]   dgst_len     The digest length
-  \param[out]  sig          Pointer to the signature buf
-  \param[out]  sig_len      The signature length
-  \return      Error code
-*/
-uint32_t sc_ecdsa_sign(sc_ecdsa_t *ecdsa,  const uint8_t *prikey,  uint32_t prikey_len,
-                            const uint8_t *dgst, uint32_t dgst_len, uint8_t *sig, uint32_t *sig_len);
-
-/**
-  \brief       Ecdsa Verify
-  \param[in]   ecdsa        Handle to operate
-  \param[in]   pubkey       Pointer to the public key buf
-  \param[in]   prikey_len   The public key length
-  \param[in]   dgst         Pointer to the digest buf
-  \param[in]   dgst_len     The digest length
-  \param[in]   sig          Pointer to the signature buf
-  \param[in]   sig_len      The signature length
-  \return      Error code
-*/
-uint32_t sc_ecdsa_verify(sc_ecdsa_t *ecdsa, const uint8_t *pubkey, uint32_t pubkey_len,
-                            const uint8_t *dgst, uint32_t gst_len,  const uint8_t *sig,  uint32_t sig_len);
-
-
-#ifdef __cplusplus
-}
-#endif
-#endif /* _SC_ECDSA_H_ */
--- a/lib/sec_library/include/sec_crypto_gcm.h
+++ b/lib/sec_library/include/sec_crypto_gcm.h
@@ -1,117 +0,0 @@
-/*
- * Copyright (C) 2017-2020 Alibaba Group Holding Limited
- */
-/******************************************************************************
- * @file     seccrypt_aes.h
- * @brief    Header File for AES
- * @version  V1.0
- * @date     20. Jul 2020
- * @model    aes
- ******************************************************************************/
-#ifndef _SC_GCM_H_
-#define _SC_GCM_H_
-
-#include "sec_include_config.h"
-#include <stdint.h>
-#include "sec_crypto_errcode.h"
-
-#ifdef CONFIG_SEC_CRYPTO_AES_SW
-#include "crypto_aes.h"
-#include <sec_crypto_aes.h>
-#endif
-
-#ifdef CONFIG_SEC_CRYPTO_GCM_SW
-#include "crypto_gcm.h"
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-
-/*Function documentation*/
-/**
-  \brief       Initialize AES Interface. Initializes the resources needed for the AES interface
-  \param[in]   aes    operate handle
-  \param[in]   idx    device id
-  \return      error code \ref uint32_t
-*/
-uint32_t sc_gcm_init(sc_aes_t *aes, uint32_t idx);
-
-/**
-  \brief       De-initialize AES Interface. stops operation and releases the software resources used by the interface
-  \param[in]   aes    handle to operate
-  \return      None
-*/
-void sc_gcm_uninit(sc_aes_t *aes);
-
-/**
-  \brief       Set encrypt key
-  \param[in]   aes        handle to operate
-  \param[in]   key        Pointer to the key buf
-  \param[in]   key_len    Pointer to \ref sc_aes_key_bits_t
-  \return      error code \ref uint32_t
-*/
-uint32_t sc_gcm_set_encrypt_key(sc_aes_t *aes, void *key, sc_aes_key_bits_t key_len);
-
-/**
-  \brief       Set decrypt key
-  \param[in]   aes        handle to operate
-  \param[in]   key        Pointer to the key buf
-  \param[in]   key_len    Pointer to \ref sc_aes_key_bits_t
-  \return      error code \ref uint32_t
-*/
-uint32_t sc_gcm_set_decrypt_key(sc_aes_t *aes, void *key, sc_aes_key_bits_t key_len);
-
-/**
-  \brief       gcm encrypt data
-  \param[in]   aes        aes handle to operate
-  \param[in]   length     Length of plaintext buffer
-  \param[in]   iv_len     Length of iv buffer
-  \param[in]   add        Pointer to the add buf, can be NULL
-  \param[in]   add_len    Length of add buffer, can ben zero
-  \param[in]   input      Pointer to the plaintext buf
-  \param[in]   output     Pointer to the cipher buf
-  \param[in]   tag_len    Length of tag buffer
-  \param[in]   tag        Pointer to the tag buf
-  \return      error code \ref uint32_t
-*/
-uint32_t sc_gcm_encrypt_and_tag(sc_aes_t *aes, uint32_t length,
-                       const void *iv,
-                       uint32_t iv_len,
-                       const void *add,
-                       uint32_t add_len,
-                       const void *input,
-                       void *output,
-                       uint32_t tag_len,
-                       void *tag);
-
-/**
-  \brief       Aes gcm decrypt
-  \param[in]   aes        aes handle to operate
-  \param[in]   length     Length of cipher buffer
-  \param[in]   iv         Pointer to the iv buf
-  \param[in]   iv_len     Length of iv buffer
-  \param[in]   add        Pointer to the add buf, can be NULL
-  \param[in]   add_len    Length of add buffer, can ben zero
-  \param[in]   input      Pointer to the cipher buf
-  \param[in]   output     Pointer to the plaintext buf
-  \param[in]   tag_len    Length of tag buffer
-  \param[in]   tag        Pointer to the tag buf
-  \return      error code \ref uint32_t
-*/
-uint32_t sc_gcm_auth_decrypt(sc_aes_t *aes, uint32_t length,
-                      const void *iv,
-                      uint32_t iv_len,
-                      const void *add,
-                      uint32_t add_len,
-                      const void *tag,
-                      uint32_t tag_len,
-                      const void *input,
-                      void *output);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* _SC_AES_H_ */
--- a/lib/sec_library/include/sec_ecies_crypto.h
+++ b/lib/sec_library/include/sec_ecies_crypto.h
@@ -1,100 +0,0 @@
-#ifndef __SEC_ECIES_CRYPTO_H__
-#define __SEC_ECIES_CRYPTO_H__
-#ifdef _WIN32
-#include "win_ctypes.h"
-#else
-#include <linux/types.h>
-#endif
-/**
-  \brief       Ecies malloc
-  \param[in]   size
-  \return      error code \ref int
-*/
-void *csi_ecies_malloc(uint32_t size);
-
-/**
-  \brief       Ecies free
-  \param[in]   buffer
-  \return      error code \ref int
-*/
-void csi_ecies_free(void *buffer);
-
-/**
-  \brief       Ecies transmit apdu command message
-  \param[in]   ss             session handle to operate
-  \param[in]   apdu           Pointer to the apdu buf
-  \param[in]   apduLen        Length of apdu buffer
-  \param[out]  apduResponse   Pointer to the apduResponse buf
-  \param[out]  apduResponseLen  Length of apduResponse buffer
-  \return      error code \ref int
-*/
-int csi_ecies_transmit_apdu(void *ss, const uint8_t *apdu,
-                                    uint32_t apduLen, uint8_t *apduResponse, uint32_t *apduResponseLen);
-
-/**
-  \brief       Ecies generate ec key pair
-  \param[in]   ss             session handle to operate
-  \param[out]  privateKey     Pointer to the private key buf
-  \param[out]  privateKeyLen  Length of private key
-  \param[out]  publicKey      Pointer to the public key buf
-  \param[out]  publicKeyLen   Length of public key
-  \return      error code \ref int
-*/
-int csi_ecies_generate_keypair(void *ss, uint8_t *privateKey, uint32_t *privateKeyLen,
-                                uint8_t *publicKey, uint32_t *publicKeyLen);
-
-/**
-  \brief       Ecies generate ec share key
-  \param[in]   ss             session handle to operate
-  \param[in]   privateKey     Pointer to the private key buf
-  \param[in]   privateKeyLen  Length of private key
-  \param[in]   publicKey      Pointer to the public key buf
-  \param[in]   publicKeyLen   Length of public key
-  \param[out]  shareKey       Pointer to the share key buf
-  \param[out]  shareKeyLen    Length of share key
-  \return      error code \ref int
-*/
-int csi_ecies_generate_share_key(void *ss, const uint8_t *privateKey, uint32_t privateKeyLen,
-                            const uint8_t *publicKey, uint32_t publicKeyLen, uint8_t *shareKey, uint32_t *shareKeyLen);
-
-/**
-  \brief       Ecies kdf ec share key
-  \param[in]   ss           session handle to operate
-  \param[in]   shareKey     Pointer to the share key buf
-  \param[in]   shareKeyLen  Length of share key
-  \param[in]   encKeyLen    Length of encrypt key
-  \param[out]  encKey       Pointer to the encrypt key buf
-  \param[in]   macKeyLen    Length of mac key
-  \param[out]  macKey       Pointer to the mac key buf
-  \return      error code \ref int
-*/
-int csi_ecies_kdf_key(void *ss, const uint8_t *shareKey, uint32_t shareKeyLen,
-                            uint32_t encKeyLen, uint8_t *encKey, uint32_t macKeyLen, uint8_t *macKey);
-
-/**
-  \brief       Ecies encrypt and generate tag
-  \param[in]   ss           session handle to operate
-  \param[in]   length       Length of input buffer
-  \param[in]   input        Pointer to the input buf
-  \param[out]  output       Pointer to the output buf
-  \param[in]   tagLen       Length of tag
-  \param[out]  tag          Pointer to the tag buf
-  \return      error code \ref int
-*/
-int csi_ecies_encrypt_and_tag(void *ss, uint32_t length, const uint8_t *input, uint8_t *output,
-                                uint32_t tagLen, uint8_t *tag);
-
-/**
-  \brief       Ecies auth tag and decrypt
-  \param[in]   ss           session handle to operate
-  \param[in]   length       Length of input buffer
-  \param[in]   tag          Pointer to the tag buf
-  \param[in]   tagLen       Length of tag
-  \param[in]   input        Pointer to the input buf
-  \param[out]  output       Pointer to the output buf
-  \return      error code \ref int
-*/
-int csi_ecies_auth_decrypt(void *ss, uint32_t length, const uint8_t *tag, uint32_t tagLen,
-                                    const uint8_t *input, uint8_t *output);
-
-#endif /* __SEC_ECIES_CRYPTO_H__ */
--- a/lib/sec_library/include/sec_ecies_session.h
+++ b/lib/sec_library/include/sec_ecies_session.h
@@ -1,170 +0,0 @@
-#ifndef __SEC_ECIES_SESSION_H__
-#define __SEC_ECIES_SESSION_H__
-
-#ifdef _WIN32
-#include "win_ctypes.h"
-#else
-#include <linux/types.h>
-#endif
-
-#include <stdint.h>
-
-#define ECIES_SDATA_MAX_LEN (1024*1024*16)
-#define ECIES_SDATA_RESPONSE_LEN 256
-#define ECIES_INIT_COMMAND_LEN   256
-#define ECIES_INIT_RESPONSE_LEN  256
-#define ECIES_CLOSE_COMMAND_LEN  32
-#define ECIES_CLOSE_RESPONSE_LEN 32
-#define ECIES_FIXED_COMMAND_LEN  16
-#define ECIES_KEY_LEN 128
-#define ECIES_TAG_LEN 16
-#define ECIES_TAG_LEN 16
-#define ECIES_DID_LEN 16
-
-#define ECIES_SEQ_DEFAULT  0x8000E000
-#define ECIES_TIMEOUT_TIME 5 /* seconds */
-
-#define ECIES_CLA_INITIALIZE_UPDATE 0x10
-#define ECIES_CLA_INITIALIZE_UPDATE_RESPONSE 0x20
-#define ECIES_CLA_SDATA_SEND 0x30
-#define ECIES_CLA_SDATA_SEND_RESPONSE 0x40
-#define ECIES_CLA_SESSION_CLOSE 0x50
-#define ECIES_CLA_SESSION_CLOSE_RESPONSE 0x60
-
-#define ECIES_RESPONSE_OK 0x90
-#define ECIES_RESPONSE_SESSION_OPENED_ERROR 0x91
-#define ECIES_RESPONSE_GEN_KEY_PAIR_ERROR 0x92
-#define ECIES_RESPONSE_GEN_SHARE_KEY_ERROR 0x93
-#define ECIES_RESPONSE_GEN_AUTH_DECRYPT_ERROR 0x94
-#define ECIES_RESPONSE_SESSION_MEM_ERROR 0x95
-#define ECIES_RESPONSE_SESSION_SEQ_ERROR 0x96
-#define ECIES_RESPONSE_SESSION_SID_ERROR 0x97
-
-#define ECIES_CLA_LEN 0x01
-#define ECIES_INS_LEN 0x01
-#define ECIES_P0_LEN  0x04
-#define ECIES_P1_LEN  0x04
-#define ECIES_P2_LEN  0x01
-#define ECIES_LC_LEN  0x04
-#define ECIES_LE_LEN  0x01
-
-#define ECIES_CLA_OFFSET   0x00
-#define ECIES_INS_OFFSET   (ECIES_CLA_OFFSET + ECIES_CLA_LEN)
-#define ECIES_P0_OFFSET    (ECIES_INS_OFFSET + ECIES_INS_LEN)
-#define ECIES_P1_OFFSET    (ECIES_P0_OFFSET + ECIES_P0_LEN)
-#define ECIES_P2_OFFSET    (ECIES_P1_OFFSET + ECIES_P1_LEN)
-#define ECIES_LC_OFFSET    (ECIES_P2_OFFSET + ECIES_P2_LEN)
-#define ECIES_DATA_OFFSET  (ECIES_LC_OFFSET + ECIES_LC_LEN)
-
-enum {
-    ECIES_SS_CLOSE = 0,
-    ECIES_SS_OPEN,
-};
-
-typedef struct _ecies_dev {
-    void *context;
-    void *transmit;
-    uint8_t DID[ECIES_DID_LEN];
-    uint8_t DIDLen;
-} ecies_dev;
-
-typedef struct _ecies_session_t {
-    ecies_dev dev;
-    uint8_t   schemeType;
-    uint8_t   shareKeyLen;
-    uint8_t   encKeyLen;
-    uint8_t   macKeyLen;
-    uint8_t   shareKey[ECIES_KEY_LEN];
-    uint8_t   encKey[ECIES_KEY_LEN];
-    uint8_t   macKey[ECIES_KEY_LEN];
-    uint32_t  sequenceNumber;
-    uint32_t  SID;
-    uint32_t  timeout;
-    uint32_t  isOpen;
-} ecies_session_t;
-
-typedef enum {
-    EC_PRIME256V1_AES_GCM_256 = 0,
-}scheme_type;
-
-/**
-  \brief       Ecies host initialization session
-  \param[in]   session      session handle to operate
-  \param[in]   context      Pointer to the user-defined context
-  \param[in]   transmit     Pointer to the user-implemented transfer
-  \param[in]   schemeType   Security scheme selection
-  \param[in]   DID          Pointer to the device ID buf
-  \param[in]   DIDLen       Length of the device ID
-  \return      error code \ref int
-*/
-int hal_ecies_host_init(ecies_session_t *session, void *context, void *transmit, uint8_t schemeType, uint8_t *DID, uint32_t DIDLen);
-
-/**
-  \brief       Ecies host session
-  \param[in]   session    session handle to operate
-  \return      error code \ref int
-*/
-int hal_ecies_host_session_open(ecies_session_t *session);
-
-/**
-  \brief       Ecies host comm session
-  \param[in]   session      session handle to operate
-  \param[in]   data         Pointer to the data to be encrypted
-  \param[in]   data_len     Length of the data
-  \return      error code \ref int
-*/
-int hal_ecies_host_session_comm(ecies_session_t *session, uint8_t *data, uint32_t dataLen);
-
-/**
-  \brief       Ecies host close session
-  \param[in]   session      session handle to operate
-  \return      error code \ref int
-*/
-int hal_ecies_host_session_close(ecies_session_t *session);
-
-/**
-  \brief       Ecies host uninitiated session
-  \param[in]   session      session handle to operate
-  \return      error code \ref int
-*/
-int hal_ecies_host_uninit(ecies_session_t *session);
-
-/**
-  \brief       Ecies slave initialization session
-  \param[in]   session      session handle to operate
-  \return      error code \ref int
-*/
-int hal_ecies_slave_init(ecies_session_t *session);
-
-/**
-  \brief       Ecies slave comm session
-  \param[in]   session      session handle to operate
-  \param[in]   apdu         Pointer to the apdu buf
-  \param[in]   apduLen      Length of the apdu buffer
-  \param[out]  apduResponse Pointer to the apduResponse buf
-  \param[out]  apduResponseLen     Length of the apduResponseLen buffer
-  \param[out]  out          Pointer to the out buf to be decrypted
-  \param[out]  outLen       Length of the out buffer
-  \return      error code \ref int
-*/
-int hal_ecies_slave_session_comm(ecies_session_t *session, uint8_t *apdu, uint32_t apduLen,
-                                    uint8_t *apduResponse, uint32_t *apduResponseLen, uint8_t *out, uint32_t *outLen);
-
-/**
-  \brief       Ecies slave uninitiated session
-  \param[in]   session      session handle to operate
-  \return      error code \ref int
-*/
-int hal_ecies_slave_uninit(ecies_session_t *session);
-
-/**
-  \brief       Ecies host get CLA and errcode
-  \param[in]   apduResponse      Pointer to the apduResponse buf
-  \param[in]   apduResponseLen   Length of the apduResponseLen buffer
-  \param[out]  CLA          CLA one byte len
-  \param[out]  errcode      Error code one byte len
-  \return      error code \ref int
-*/
-int hal_ecies_status_get(uint8_t *apduResponse, uint32_t apduResponseLen, uint8_t *CLA, uint8_t *status);
-
-#endif /* __SEC_ECIES_SESSION_H__ */
--- a/lib/sec_library/include/sec_library.h
+++ b/lib/sec_library/include/sec_library.h
@@ -28,8 +28,6 @@
 #include "sec_crypto_ecc.h"
 #include "sec_crypto_ecdh.h"
 #include "csi_sec_img_verify.h"
-#include "sec_ecies_crypto.h"
-#include "sec_ecies_session.h"
 /* NOTE add more header */

 #endif /* _SL_H_ */
--- a/lib/sec_library/include/soft_crypto/crypto_aes.h
+++ b/lib/sec_library/include/soft_crypto/crypto_aes.h
@@ -1,320 +0,0 @@
-/**
- * \file aes.h
- *
- * \brief AES block cipher
- *
- *  Copyright (C) 2006-2015, ARM Limited, All Rights Reserved
- *  SPDX-License-Identifier: Apache-2.0
- *
- *  Licensed under the Apache License, Version 2.0 (the "License"); you may
- *  not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
- *
- *  http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- *  WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- *
- *  This file is part of mbed TLS (https://tls.mbed.org)
- */
-#ifndef SC_MBEDTLS_AES_H
-#define SC_MBEDTLS_AES_H
-
-#include "crypto_config.h"
-
-#include <stddef.h>
-#include <stdint.h>
-#include "sec_crypto_errcode.h"
-
-/* padlock.c and aesni.c rely on these values! */
-#define MBEDTLS_AES_ENCRYPT     1
-#define MBEDTLS_AES_DECRYPT     0
-
-#define SC_MBEDTLS_ERR_AES_INVALID_KEY_LENGTH                SC_INVALID_KEY_LENGTH  /**< Invalid key length. */
-#define SC_MBEDTLS_ERR_AES_INVALID_INPUT_LENGTH              SC_INVALID_INPUT_LENGTH  /**< Invalid data input length. */
-
-
-// Regular implementation
-//
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/**
- * \brief          AES context structure
- *
- * \note           buf is able to hold 32 extra bytes, which can be used:
- *                 - for alignment purposes if VIA padlock is used, and/or
- *                 - to simplify key expansion in the 256-bit case by
- *                 generating an extra round key
- */
-typedef struct
-{
-    int nr;                     /*!<  number of rounds  */
-    uint32_t *rk;               /*!<  AES round keys    */
-    uint32_t buf[68];           /*!<  unaligned data    */
-}
-sc_mbedtls_aes_context;
-
-/**
- * \brief          Initialize AES context
- *
- * \param ctx      AES context to be initialized
- */
-void sc_mbedtls_aes_init( sc_mbedtls_aes_context *ctx );
-
-/**
- * \brief          Clear AES context
- *
- * \param ctx      AES context to be cleared
- */
-void sc_mbedtls_aes_free( sc_mbedtls_aes_context *ctx );
-
-/**
- * \brief          AES key schedule (encryption)
- *
- * \param ctx      AES context to be initialized
- * \param key      encryption key
- * \param keybits  must be 128, 192 or 256
- *
- * \return         0 if successful, or SC_MBEDTLS_ERR_AES_INVALID_KEY_LENGTH
- */
-int sc_mbedtls_aes_setkey_enc( sc_mbedtls_aes_context *ctx, const unsigned char *key,
-                    unsigned int keybits );
-
-/**
- * \brief          AES key schedule (decryption)
- *
- * \param ctx      AES context to be initialized
- * \param key      decryption key
- * \param keybits  must be 128, 192 or 256
- *
- * \return         0 if successful, or SC_MBEDTLS_ERR_AES_INVALID_KEY_LENGTH
- */
-int sc_mbedtls_aes_setkey_dec( sc_mbedtls_aes_context *ctx, const unsigned char *key,
-                    unsigned int keybits );
-
-/**
- * \brief          AES-ECB block encryption/decryption
- *
- * \param ctx      AES context
- * \param mode     MBEDTLS_AES_ENCRYPT or MBEDTLS_AES_DECRYPT
- * \param input    16-byte input block
- * \param output   16-byte output block
- *
- * \return         0 if successful
- */
-int sc_mbedtls_aes_crypt_ecb( sc_mbedtls_aes_context *ctx,
-                    int mode,
-                    const unsigned char input[16],
-                    unsigned char output[16] );
-
-#if defined(MBEDTLS_CIPHER_MODE_CBC)
-/**
- * \brief          AES-CBC buffer encryption/decryption
- *                 Length should be a multiple of the block
- *                 size (16 bytes)
- *
- * \note           Upon exit, the content of the IV is updated so that you can
- *                 call the function same function again on the following
- *                 block(s) of data and get the same result as if it was
- *                 encrypted in one call. This allows a "streaming" usage.
- *                 If on the other hand you need to retain the contents of the
- *                 IV, you should either save it manually or use the cipher
- *                 module instead.
- *
- * \param ctx      AES context
- * \param mode     MBEDTLS_AES_ENCRYPT or MBEDTLS_AES_DECRYPT
- * \param length   length of the input data
- * \param iv       initialization vector (updated after use)
- * \param input    buffer holding the input data
- * \param output   buffer holding the output data
- *
- * \return         0 if successful, or SC_MBEDTLS_ERR_AES_INVALID_INPUT_LENGTH
- */
-int sc_mbedtls_aes_crypt_cbc( sc_mbedtls_aes_context *ctx,
-                    int mode,
-                    size_t length,
-                    unsigned char iv[16],
-                    const unsigned char *input,
-                    unsigned char *output );
-#endif /* MBEDTLS_CIPHER_MODE_CBC */
-
-#if defined(MBEDTLS_CIPHER_MODE_CFB)
-/**
- * \brief          AES-CFB128 buffer encryption/decryption.
- *
- * Note: Due to the nature of CFB you should use the same key schedule for
- * both encryption and decryption. So a context initialized with
- * sc_mbedtls_aes_setkey_enc() for both MBEDTLS_AES_ENCRYPT and MBEDTLS_AES_DECRYPT.
- *
- * \note           Upon exit, the content of the IV is updated so that you can
- *                 call the function same function again on the following
- *                 block(s) of data and get the same result as if it was
- *                 encrypted in one call. This allows a "streaming" usage.
- *                 If on the other hand you need to retain the contents of the
- *                 IV, you should either save it manually or use the cipher
- *                 module instead.
- *
- * \param ctx      AES context
- * \param mode     MBEDTLS_AES_ENCRYPT or MBEDTLS_AES_DECRYPT
- * \param length   length of the input data
- * \param iv_off   offset in IV (updated after use)
- * \param iv       initialization vector (updated after use)
- * \param input    buffer holding the input data
- * \param output   buffer holding the output data
- *
- * \return         0 if successful
- */
-int sc_mbedtls_aes_crypt_cfb128( sc_mbedtls_aes_context *ctx,
-                       int mode,
-                       size_t length,
-                       size_t *iv_off,
-                       unsigned char iv[16],
-                       const unsigned char *input,
-                       unsigned char *output );
-
-/**
- * \brief          AES-CFB8 buffer encryption/decryption.
- *
- * Note: Due to the nature of CFB you should use the same key schedule for
- * both encryption and decryption. So a context initialized with
- * sc_mbedtls_aes_setkey_enc() for both MBEDTLS_AES_ENCRYPT and MBEDTLS_AES_DECRYPT.
- *
- * \note           Upon exit, the content of the IV is updated so that you can
- *                 call the function same function again on the following
- *                 block(s) of data and get the same result as if it was
- *                 encrypted in one call. This allows a "streaming" usage.
- *                 If on the other hand you need to retain the contents of the
- *                 IV, you should either save it manually or use the cipher
- *                 module instead.
- *
- * \param ctx      AES context
- * \param mode     MBEDTLS_AES_ENCRYPT or MBEDTLS_AES_DECRYPT
- * \param length   length of the input data
- * \param iv       initialization vector (updated after use)
- * \param input    buffer holding the input data
- * \param output   buffer holding the output data
- *
- * \return         0 if successful
- */
-int sc_mbedtls_aes_crypt_cfb8( sc_mbedtls_aes_context *ctx,
-                    int mode,
-                    size_t length,
-                    unsigned char iv[16],
-                    const unsigned char *input,
-                    unsigned char *output );
-#endif /*MBEDTLS_CIPHER_MODE_CFB */
-
-#if defined(MBEDTLS_CIPHER_MODE_CTR)
-/**
- * \brief               AES-CTR buffer encryption/decryption
- *
- * Warning: You have to keep the maximum use of your counter in mind!
- *
- * Note: Due to the nature of CTR you should use the same key schedule for
- * both encryption and decryption. So a context initialized with
- * sc_mbedtls_aes_setkey_enc() for both MBEDTLS_AES_ENCRYPT and MBEDTLS_AES_DECRYPT.
- *
- * \param ctx           AES context
- * \param length        The length of the data
- * \param nc_off        The offset in the current stream_block (for resuming
- *                      within current cipher stream). The offset pointer to
- *                      should be 0 at the start of a stream.
- * \param nonce_counter The 128-bit nonce and counter.
- * \param stream_block  The saved stream-block for resuming. Is overwritten
- *                      by the function.
- * \param input         The input data stream
- * \param output        The output data stream
- *
- * \return         0 if successful
- */
-int sc_mbedtls_aes_crypt_ctr( sc_mbedtls_aes_context *ctx,
-                       size_t length,
-                       size_t *nc_off,
-                       unsigned char nonce_counter[16],
-                       unsigned char stream_block[16],
-                       const unsigned char *input,
-                       unsigned char *output );
-#endif /* MBEDTLS_CIPHER_MODE_CTR */
-
-/**
- * \brief           Internal AES block encryption function
- *                  (Only exposed to allow overriding it,
- *                  see MBEDTLS_AES_ENCRYPT_ALT)
- *
- * \param ctx       AES context
- * \param input     Plaintext block
- * \param output    Output (ciphertext) block
- *
- * \return          0 if successful
- */
-int sc_mbedtls_internal_aes_encrypt( sc_mbedtls_aes_context *ctx,
-                                  const unsigned char input[16],
-                                  unsigned char output[16] );
-
-/**
- * \brief           Internal AES block decryption function
- *                  (Only exposed to allow overriding it,
- *                  see MBEDTLS_AES_DECRYPT_ALT)
- *
- * \param ctx       AES context
- * \param input     Ciphertext block
- * \param output    Output (plaintext) block
- *
- * \return          0 if successful
- */
-int sc_mbedtls_internal_aes_decrypt( sc_mbedtls_aes_context *ctx,
-                                  const unsigned char input[16],
-                                  unsigned char output[16] );
-
-
-/**
- * \brief           Internal AES block encryption function
- *                  (Only exposed to allow overriding it,
- *                  see MBEDTLS_AES_ENCRYPT_ALT)
- *
- * \deprecated      Superseded by sc_mbedtls_aes_encrypt_ext() in 2.5.0
- *
- * \param ctx       AES context
- * \param input     Plaintext block
- * \param output    Output (ciphertext) block
- */
-static inline void sc_mbedtls_aes_encrypt(
-                                                sc_mbedtls_aes_context *ctx,
-                                                const unsigned char input[16],
-                                                unsigned char output[16] )
-{
-    sc_mbedtls_internal_aes_encrypt( ctx, input, output );
-}
-
-/**
- * \brief           Internal AES block decryption function
- *                  (Only exposed to allow overriding it,
- *                  see MBEDTLS_AES_DECRYPT_ALT)
- *
- * \deprecated      Superseded by sc_mbedtls_aes_decrypt_ext() in 2.5.0
- *
- * \param ctx       AES context
- * \param input     Ciphertext block
- * \param output    Output (plaintext) block
- */
-static inline void sc_mbedtls_aes_decrypt(
-                                                sc_mbedtls_aes_context *ctx,
-                                                const unsigned char input[16],
-                                                unsigned char output[16] )
-{
-    sc_mbedtls_internal_aes_decrypt( ctx, input, output );
-}
-
-
-#ifdef __cplusplus
-}
-#endif
-
-
-#endif /* aes.h */
--- a/lib/sec_library/include/soft_crypto/crypto_asn1.h
+++ b/lib/sec_library/include/soft_crypto/crypto_asn1.h
@@ -1,336 +0,0 @@
-/**
- * \file asn1.h
- *
- * \brief Generic ASN.1 parsing
- *
- *  Copyright (C) 2006-2015, ARM Limited, All Rights Reserved
- *  SPDX-License-Identifier: Apache-2.0
- *
- *  Licensed under the Apache License, Version 2.0 (the "License"); you may
- *  not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
- *
- *  http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- *  WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- *
- *  This file is part of mbed TLS (https://tls.mbed.org)
- */
-#ifndef SC_MBEDTLS_ASN1_H
-#define SC_MBEDTLS_ASN1_H
-
-#include "crypto_config.h"
-
-#include <stddef.h>
-
-#include "crypto_bignum.h"
-
-/**
- * \addtogroup asn1_module
- * \{
- */
-
-/**
- * \name ASN1 Error codes
- * These error codes are OR'ed to X509 error codes for
- * higher error granularity.
- * ASN1 is a standard to specify data structures.
- * \{
- */
-#define SC_MBEDTLS_ERR_ASN1_OUT_OF_DATA                      SC_INVALID_FORMAT  /**< Out of data when parsing an ASN1 data structure. */
-#define SC_MBEDTLS_ERR_ASN1_UNEXPECTED_TAG                   SC_INVALID_FORMAT  /**< ASN1 tag was of an unexpected value. */
-#define SC_MBEDTLS_ERR_ASN1_INVALID_LENGTH                   SC_INVALID_FORMAT  /**< Error when trying to determine the length or invalid length. */
-#define SC_MBEDTLS_ERR_ASN1_LENGTH_MISMATCH                  SC_INVALID_FORMAT  /**< Actual length differs from expected length. */
-#define SC_MBEDTLS_ERR_ASN1_INVALID_DATA                     SC_INVALID_FORMAT  /**< Data is invalid. (not used) */
-#define SC_MBEDTLS_ERR_ASN1_ALLOC_FAILED                     SC_INVALID_FORMAT  /**< Memory allocation failed */
-#define SC_MBEDTLS_ERR_ASN1_BUF_TOO_SMALL                    SC_INVALID_FORMAT  /**< Buffer too small when writing ASN.1 data structure. */
-
-/* \} name */
-
-/**
- * \name DER constants
- * These constants comply with DER encoded the ANS1 type tags.
- * DER encoding uses hexadecimal representation.
- * An example DER sequence is:\n
- * - 0x02 -- tag indicating INTEGER
- * - 0x01 -- length in octets
- * - 0x05 -- value
- * Such sequences are typically read into \c ::mbedtls_x509_buf.
- * \{
- */
-#define MBEDTLS_ASN1_BOOLEAN                 0x01
-#define MBEDTLS_ASN1_INTEGER                 0x02
-#define MBEDTLS_ASN1_BIT_STRING              0x03
-#define MBEDTLS_ASN1_OCTET_STRING            0x04
-#define MBEDTLS_ASN1_NULL                    0x05
-#define MBEDTLS_ASN1_OID                     0x06
-#define MBEDTLS_ASN1_UTF8_STRING             0x0C
-#define MBEDTLS_ASN1_SEQUENCE                0x10
-#define MBEDTLS_ASN1_SET                     0x11
-#define MBEDTLS_ASN1_PRINTABLE_STRING        0x13
-#define MBEDTLS_ASN1_T61_STRING              0x14
-#define MBEDTLS_ASN1_IA5_STRING              0x16
-#define MBEDTLS_ASN1_UTC_TIME                0x17
-#define MBEDTLS_ASN1_GENERALIZED_TIME        0x18
-#define MBEDTLS_ASN1_UNIVERSAL_STRING        0x1C
-#define MBEDTLS_ASN1_BMP_STRING              0x1E
-#define MBEDTLS_ASN1_PRIMITIVE               0x00
-#define MBEDTLS_ASN1_CONSTRUCTED             0x20
-#define MBEDTLS_ASN1_CONTEXT_SPECIFIC        0x80
-/* \} name */
-/* \} addtogroup asn1_module */
-
-/** Returns the size of the binary string, without the trailing \\0 */
-#define MBEDTLS_OID_SIZE(x) (sizeof(x) - 1)
-
-/**
- * Compares an sc_mbedtls_asn1_buf structure to a reference OID.
- *
- * Only works for 'defined' oid_str values (MBEDTLS_OID_HMAC_SHA1), you cannot use a
- * 'unsigned char *oid' here!
- */
-#define MBEDTLS_OID_CMP(oid_str, oid_buf)                                   \
-        ( ( MBEDTLS_OID_SIZE(oid_str) != (oid_buf)->len ) ||                \
-          memcmp( (oid_str), (oid_buf)->p, (oid_buf)->len) != 0 )
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/**
- * \name Functions to parse ASN.1 data structures
- * \{
- */
-
-/**
- * Type-length-value structure that allows for ASN1 using DER.
- */
-typedef struct sc_mbedtls_asn1_buf
-{
-    int tag;                /**< ASN1 type, e.g. MBEDTLS_ASN1_UTF8_STRING. */
-    size_t len;             /**< ASN1 length, in octets. */
-    unsigned char *p;       /**< ASN1 data, e.g. in ASCII. */
-}
-sc_mbedtls_asn1_buf;
-
-/**
- * Container for ASN1 bit strings.
- */
-typedef struct sc_mbedtls_asn1_bitstring
-{
-    size_t len;                 /**< ASN1 length, in octets. */
-    unsigned char unused_bits;  /**< Number of unused bits at the end of the string */
-    unsigned char *p;           /**< Raw ASN1 data for the bit string */
-}
-sc_mbedtls_asn1_bitstring;
-
-/**
- * Container for a sequence of ASN.1 items
- */
-typedef struct sc_mbedtls_asn1_sequence
-{
-    sc_mbedtls_asn1_buf buf;                   /**< Buffer containing the given ASN.1 item. */
-    struct sc_mbedtls_asn1_sequence *next;    /**< The next entry in the sequence. */
-}
-sc_mbedtls_asn1_sequence;
-
-/**
- * Container for a sequence or list of 'named' ASN.1 data items
- */
-typedef struct sc_mbedtls_asn1_named_data
-{
-    sc_mbedtls_asn1_buf oid;                   /**< The object identifier. */
-    sc_mbedtls_asn1_buf val;                   /**< The named value. */
-    struct sc_mbedtls_asn1_named_data *next;  /**< The next entry in the sequence. */
-    unsigned char next_merged;      /**< Merge next item into the current one? */
-}
-sc_mbedtls_asn1_named_data;
-
-/**
- * \brief       Get the length of an ASN.1 element.
- *              Updates the pointer to immediately behind the length.
- *
- * \param p     The position in the ASN.1 data
- * \param end   End of data
- * \param len   The variable that will receive the value
- *
- * \return      0 if successful, SC_MBEDTLS_ERR_ASN1_OUT_OF_DATA on reaching
- *              end of data, SC_MBEDTLS_ERR_ASN1_INVALID_LENGTH if length is
- *              unparseable.
- */
-int sc_mbedtls_asn1_get_len( unsigned char **p,
-                  const unsigned char *end,
-                  size_t *len );
-
-/**
- * \brief       Get the tag and length of the tag. Check for the requested tag.
- *              Updates the pointer to immediately behind the tag and length.
- *
- * \param p     The position in the ASN.1 data
- * \param end   End of data
- * \param len   The variable that will receive the length
- * \param tag   The expected tag
- *
- * \return      0 if successful, SC_MBEDTLS_ERR_ASN1_UNEXPECTED_TAG if tag did
- *              not match requested tag, or another specific ASN.1 error code.
- */
-int sc_mbedtls_asn1_get_tag( unsigned char **p,
-                  const unsigned char *end,
-                  size_t *len, int tag );
-
-/**
- * \brief       Retrieve a boolean ASN.1 tag and its value.
- *              Updates the pointer to immediately behind the full tag.
- *
- * \param p     The position in the ASN.1 data
- * \param end   End of data
- * \param val   The variable that will receive the value
- *
- * \return      0 if successful or a specific ASN.1 error code.
- */
-int sc_mbedtls_asn1_get_bool( unsigned char **p,
-                   const unsigned char *end,
-                   int *val );
-
-/**
- * \brief       Retrieve an integer ASN.1 tag and its value.
- *              Updates the pointer to immediately behind the full tag.
- *
- * \param p     The position in the ASN.1 data
- * \param end   End of data
- * \param val   The variable that will receive the value
- *
- * \return      0 if successful or a specific ASN.1 error code.
- */
-int sc_mbedtls_asn1_get_int( unsigned char **p,
-                  const unsigned char *end,
-                  int *val );
-
-/**
- * \brief       Retrieve a bitstring ASN.1 tag and its value.
- *              Updates the pointer to immediately behind the full tag.
- *
- * \param p     The position in the ASN.1 data
- * \param end   End of data
- * \param bs    The variable that will receive the value
- *
- * \return      0 if successful or a specific ASN.1 error code.
- */
-int sc_mbedtls_asn1_get_bitstring( unsigned char **p, const unsigned char *end,
-                        sc_mbedtls_asn1_bitstring *bs);
-
-/**
- * \brief       Retrieve a bitstring ASN.1 tag without unused bits and its
- *              value.
- *              Updates the pointer to the beginning of the bit/octet string.
- *
- * \param p     The position in the ASN.1 data
- * \param end   End of data
- * \param len   Length of the actual bit/octect string in bytes
- *
- * \return      0 if successful or a specific ASN.1 error code.
- */
-int sc_mbedtls_asn1_get_bitstring_null( unsigned char **p, const unsigned char *end,
-                             size_t *len );
-
-/**
- * \brief       Parses and splits an ASN.1 "SEQUENCE OF <tag>"
- *              Updated the pointer to immediately behind the full sequence tag.
- *
- * \param p     The position in the ASN.1 data
- * \param end   End of data
- * \param cur   First variable in the chain to fill
- * \param tag   Type of sequence
- *
- * \return      0 if successful or a specific ASN.1 error code.
- */
-int sc_mbedtls_asn1_get_sequence_of( unsigned char **p,
-                          const unsigned char *end,
-                          sc_mbedtls_asn1_sequence *cur,
-                          int tag);
-
-#if defined(MBEDTLS_BIGNUM_C)
-/**
- * \brief       Retrieve a MPI value from an integer ASN.1 tag.
- *              Updates the pointer to immediately behind the full tag.
- *
- * \param p     The position in the ASN.1 data
- * \param end   End of data
- * \param X     The MPI that will receive the value
- *
- * \return      0 if successful or a specific ASN.1 or MPI error code.
- */
-int sc_mbedtls_asn1_get_mpi( unsigned char **p,
-                  const unsigned char *end,
-                  sc_mbedtls_mpi *X );
-#endif /* MBEDTLS_BIGNUM_C */
-
-/**
- * \brief       Retrieve an AlgorithmIdentifier ASN.1 sequence.
- *              Updates the pointer to immediately behind the full
- *              AlgorithmIdentifier.
- *
- * \param p     The position in the ASN.1 data
- * \param end   End of data
- * \param alg   The buffer to receive the OID
- * \param params The buffer to receive the params (if any)
- *
- * \return      0 if successful or a specific ASN.1 or MPI error code.
- */
-int sc_mbedtls_asn1_get_alg( unsigned char **p,
-                  const unsigned char *end,
-                  sc_mbedtls_asn1_buf *alg, sc_mbedtls_asn1_buf *params );
-
-/**
- * \brief       Retrieve an AlgorithmIdentifier ASN.1 sequence with NULL or no
- *              params.
- *              Updates the pointer to immediately behind the full
- *              AlgorithmIdentifier.
- *
- * \param p     The position in the ASN.1 data
- * \param end   End of data
- * \param alg   The buffer to receive the OID
- *
- * \return      0 if successful or a specific ASN.1 or MPI error code.
- */
-int sc_mbedtls_asn1_get_alg_null( unsigned char **p,
-                       const unsigned char *end,
-                       sc_mbedtls_asn1_buf *alg );
-
-/**
- * \brief       Find a specific named_data entry in a sequence or list based on
- *              the OID.
- *
- * \param list  The list to seek through
- * \param oid   The OID to look for
- * \param len   Size of the OID
- *
- * \return      NULL if not found, or a pointer to the existing entry.
- */
-sc_mbedtls_asn1_named_data *sc_mbedtls_asn1_find_named_data( sc_mbedtls_asn1_named_data *list,
-                                       const char *oid, size_t len );
-
-/**
- * \brief       Free a sc_mbedtls_asn1_named_data entry
- *
- * \param entry The named data entry to free
- */
-void sc_mbedtls_asn1_free_named_data( sc_mbedtls_asn1_named_data *entry );
-
-/**
- * \brief       Free all entries in a sc_mbedtls_asn1_named_data list
- *              Head will be set to NULL
- *
- * \param head  Pointer to the head of the list of named data entries to free
- */
-void sc_mbedtls_asn1_free_named_data_list( sc_mbedtls_asn1_named_data **head );
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* asn1.h */
--- a/lib/sec_library/include/soft_crypto/crypto_base64.h
+++ b/lib/sec_library/include/soft_crypto/crypto_base64.h
@@ -1,16 +0,0 @@
-/* SPDX-License-Identifier: BSD-2-Clause */
-/*
- * Copyright (c) 2014, STMicroelectronics International N.V.
- */
-#ifndef BASE64_H
-#define BASE64_H
-
-#include <stdint.h>
-#include <stdbool.h>
-#include <stddef.h>
-
-bool _base64_enc(const void *data, size_t size, char *buf, size_t *blen);
-bool _base64_dec(const char *data, size_t size, void *buf, size_t *blen);
-size_t _base64_enc_len(size_t size);
-
-#endif /* BASE64_H */
--- a/lib/sec_library/include/soft_crypto/crypto_bignum.h
+++ b/lib/sec_library/include/soft_crypto/crypto_bignum.h
@@ -1,670 +0,0 @@
-/**
- * \file bignum.h
- *
- * \brief  Multi-precision integer library
- *
- *  Copyright (C) 2006-2015, ARM Limited, All Rights Reserved
- *  SPDX-License-Identifier: Apache-2.0
- *
- *  Licensed under the Apache License, Version 2.0 (the "License"); you may
- *  not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
- *
- *  http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- *  WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- *
- *  This file is part of mbed TLS (https://tls.mbed.org)
- */
-#ifndef SC_MBEDTLS_BIGNUM_H
-#define SC_MBEDTLS_BIGNUM_H
-
-#include "crypto_config.h"
-
-#include <stddef.h>
-#include <stdint.h>
-#include "sec_crypto_errcode.h"
-
-
-#define SC_MBEDTLS_ERR_MPI_BAD_INPUT_DATA SC_PARAM_INV /**< Bad input parameters to function. */
-#define SC_MBEDTLS_ERR_MPI_INVALID_CHARACTER                                                          \
-    SC_PARAM_INV /**< There is an invalid character in the digit string. */
-#define SC_MBEDTLS_ERR_MPI_BUFFER_TOO_SMALL SC_BUFFER_TOO_SMALL /**< The buffer is too small to write to. */
-#define SC_MBEDTLS_ERR_MPI_NEGATIVE_VALUE                                                             \
-    SC_PARAM_INV /**< The input arguments are negative or result in illegal output. */
-#define SC_MBEDTLS_ERR_MPI_DIVISION_BY_ZERO                                                           \
-    SC_PARAM_INV /**< The input argument for division is zero, which is not allowed. */
-#define SC_MBEDTLS_ERR_MPI_NOT_ACCEPTABLE SC_PARAM_INV /**< The input arguments are not acceptable. */
-#define SC_MBEDTLS_ERR_MPI_ALLOC_FAILED SC_ALLOC_FAILED   /**< Memory allocation failed. */
-
-#define SC_MBEDTLS_MPI_CHK(f)                                                                         \
-    do {                                                                                           \
-        if ((ret = f) != 0)                                                                        \
-            goto cleanup;                                                                          \
-    } while (0)
-
-/*
- * Maximum size MPIs are allowed to grow to in number of limbs.
- */
-#define SC_MBEDTLS_MPI_MAX_LIMBS 10000
-
-#if !defined(SC_MBEDTLS_MPI_WINDOW_SIZE)
-/*
- * Maximum window size used for modular exponentiation. Default: 6
- * Minimum value: 1. Maximum value: 6.
- *
- * Result is an array of ( 2 << SC_MBEDTLS_MPI_WINDOW_SIZE ) MPIs used
- * for the sliding window calculation. (So 64 by default)
- *
- * Reduction in size, reduces speed.
- */
-#define SC_MBEDTLS_MPI_WINDOW_SIZE 6 /**< Maximum windows size used. */
-#endif                            /* !SC_MBEDTLS_MPI_WINDOW_SIZE */
-
-#if !defined(SC_MBEDTLS_MPI_MAX_SIZE)
-/*
- * Maximum size of MPIs allowed in bits and bytes for user-MPIs.
- * ( Default: 512 bytes => 4096 bits, Maximum tested: 2048 bytes => 16384 bits )
- *
- * Note: Calculations can results temporarily in larger MPIs. So the number
- * of limbs required (SC_MBEDTLS_MPI_MAX_LIMBS) is higher.
- */
-#define SC_MBEDTLS_MPI_MAX_SIZE 1024 /**< Maximum number of bytes for usable MPIs. */
-#endif                            /* !SC_MBEDTLS_MPI_MAX_SIZE */
-
-#define SC_MBEDTLS_MPI_MAX_BITS                                                                       \
-    (8 * SC_MBEDTLS_MPI_MAX_SIZE) /**< Maximum number of bits for usable MPIs. */
-
-/*
- * When reading from files with sc_mbedtls_mpi_read_file() and writing to files with
- * sc_mbedtls_mpi_write_file() the buffer should have space
- * for a (short) label, the MPI (in the provided radix), the newline
- * characters and the '\0'.
- *
- * By default we assume at least a 10 char label, a minimum radix of 10
- * (decimal) and a maximum of 4096 bit numbers (1234 decimal chars).
- * Autosized at compile time for at least a 10 char label, a minimum radix
- * of 10 (decimal) for a number of SC_MBEDTLS_MPI_MAX_BITS size.
- *
- * This used to be statically sized to 1250 for a maximum of 4096 bit
- * numbers (1234 decimal chars).
- *
- * Calculate using the formula:
- *  SC_MBEDTLS_MPI_RW_BUFFER_SIZE = ceil(SC_MBEDTLS_MPI_MAX_BITS / ln(10) * ln(2)) +
- *                                LabelSize + 6
- */
-#define SC_SC_MBEDTLS_MPI_MAX_BITS_SCALE100 (100 * SC_MBEDTLS_MPI_MAX_BITS)
-#define SC_MBEDTLS_LN_2_DIV_LN_10_SCALE100 332
-#define SC_MBEDTLS_MPI_RW_BUFFER_SIZE                                                                 \
-    (((SC_SC_MBEDTLS_MPI_MAX_BITS_SCALE100 + SC_MBEDTLS_LN_2_DIV_LN_10_SCALE100 - 1) /                      \
-      SC_MBEDTLS_LN_2_DIV_LN_10_SCALE100) +                                                           \
-     10 + 6)
-
-/*
- * Define the base integer type, architecture-wise.
- *
- * 32-bit integers can be forced on 64-bit arches (eg. for testing purposes)
- * by defining SC_MBEDTLS_HAVE_INT32 and undefining MBEDTLS_HAVE_ASM
- */
-
-#define SC_MBEDTLS_HAVE_INT32
-typedef int32_t  sc_mbedtls_mpi_sint;
-typedef uint32_t sc_mbedtls_mpi_uint;
-//typedef uint64_t mbedtls_t_udbl;
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/**
- * \brief          MPI structure
- */
-typedef struct {
-    int                   s; /*!<  integer sign      */
-    size_t                n; /*!<  total # of limbs  */
-    sc_mbedtls_mpi_uint *p; /*!<  pointer to limbs  */
-} sc_mbedtls_mpi;
-
-/**
- * \brief           Initialize one MPI (make internal references valid)
- *                  This just makes it ready to be set or freed,
- *                  but does not define a value for the MPI.
- *
- * \param X         One MPI to initialize.
- */
-void sc_mbedtls_mpi_init(sc_mbedtls_mpi *X);
-
-/**
- * \brief          Unallocate one MPI
- *
- * \param X        One MPI to unallocate.
- */
-void sc_mbedtls_mpi_free(sc_mbedtls_mpi *X);
-
-/**
- * \brief          Enlarge to the specified number of limbs
- *
- * \param X        MPI to grow
- * \param nblimbs  The target number of limbs
- *
- * \return         0 if successful,
- *                 SC_MBEDTLS_ERR_MPI_ALLOC_FAILED if memory allocation failed
- */
-int sc_mbedtls_mpi_grow(sc_mbedtls_mpi *X, size_t nblimbs);
-
-/**
- * \brief          Resize down, keeping at least the specified number of limbs
- *
- * \param X        MPI to shrink
- * \param nblimbs  The minimum number of limbs to keep
- *
- * \return         0 if successful,
- *                 SC_MBEDTLS_ERR_MPI_ALLOC_FAILED if memory allocation failed
- */
-int sc_mbedtls_mpi_shrink(sc_mbedtls_mpi *X, size_t nblimbs);
-
-/**
- * \brief          Copy the contents of Y into X
- *
- * \param X        Destination MPI
- * \param Y        Source MPI
- *
- * \return         0 if successful,
- *                 SC_MBEDTLS_ERR_MPI_ALLOC_FAILED if memory allocation failed
- */
-int sc_mbedtls_mpi_copy(sc_mbedtls_mpi *X, const sc_mbedtls_mpi *Y);
-
-/**
- * \brief          Swap the contents of X and Y
- *
- * \param X        First MPI value
- * \param Y        Second MPI value
- */
-void sc_mbedtls_mpi_swap(sc_mbedtls_mpi *X, sc_mbedtls_mpi *Y);
-
-/**
- * \brief          Safe conditional assignement X = Y if assign is 1
- *
- * \param X        MPI to conditionally assign to
- * \param Y        Value to be assigned
- * \param assign   1: perform the assignment, 0: keep X's original value
- *
- * \return         0 if successful,
- *                 SC_MBEDTLS_ERR_MPI_ALLOC_FAILED if memory allocation failed,
- *
- * \note           This function is equivalent to
- *                      if( assign ) sc_mbedtls_mpi_copy( X, Y );
- *                 except that it avoids leaking any information about whether
- *                 the assignment was done or not (the above code may leak
- *                 information through branch prediction and/or memory access
- *                 patterns analysis).
- */
-int sc_mbedtls_mpi_safe_cond_assign(sc_mbedtls_mpi *X, const sc_mbedtls_mpi *Y,
-                                     unsigned char assign);
-
-/**
- * \brief          Safe conditional swap X <-> Y if swap is 1
- *
- * \param X        First sc_mbedtls_mpi value
- * \param Y        Second sc_mbedtls_mpi value
- * \param assign   1: perform the swap, 0: keep X and Y's original values
- *
- * \return         0 if successful,
- *                 SC_MBEDTLS_ERR_MPI_ALLOC_FAILED if memory allocation failed,
- *
- * \note           This function is equivalent to
- *                      if( assign ) sc_mbedtls_mpi_swap( X, Y );
- *                 except that it avoids leaking any information about whether
- *                 the assignment was done or not (the above code may leak
- *                 information through branch prediction and/or memory access
- *                 patterns analysis).
- */
-int sc_mbedtls_mpi_safe_cond_swap(sc_mbedtls_mpi *X, sc_mbedtls_mpi *Y, unsigned char assign);
-
-/**
- * \brief          Set value from integer
- *
- * \param X        MPI to set
- * \param z        Value to use
- *
- * \return         0 if successful,
- *                 SC_MBEDTLS_ERR_MPI_ALLOC_FAILED if memory allocation failed
- */
-int sc_mbedtls_mpi_lset(sc_mbedtls_mpi *X, sc_mbedtls_mpi_sint z);
-
-/**
- * \brief          Get a specific bit from X
- *
- * \param X        MPI to use
- * \param pos      Zero-based index of the bit in X
- *
- * \return         Either a 0 or a 1
- */
-int sc_mbedtls_mpi_get_bit(const sc_mbedtls_mpi *X, size_t pos);
-
-/**
- * \brief          Set a bit of X to a specific value of 0 or 1
- *
- * \note           Will grow X if necessary to set a bit to 1 in a not yet
- *                 existing limb. Will not grow if bit should be set to 0
- *
- * \param X        MPI to use
- * \param pos      Zero-based index of the bit in X
- * \param val      The value to set the bit to (0 or 1)
- *
- * \return         0 if successful,
- *                 SC_MBEDTLS_ERR_MPI_ALLOC_FAILED if memory allocation failed,
- *                 SC_MBEDTLS_ERR_MPI_BAD_INPUT_DATA if val is not 0 or 1
- */
-int sc_mbedtls_mpi_set_bit(sc_mbedtls_mpi *X, size_t pos, unsigned char val);
-
-/**
- * \brief          Return the number of zero-bits before the least significant
- *                 '1' bit
- *
- * Note: Thus also the zero-based index of the least significant '1' bit
- *
- * \param X        MPI to use
- */
-size_t sc_mbedtls_mpi_lsb(const sc_mbedtls_mpi *X);
-
-/**
- * \brief          Return the number of bits up to and including the most
- *                 significant '1' bit'
- *
- * Note: Thus also the one-based index of the most significant '1' bit
- *
- * \param X        MPI to use
- */
-size_t sc_mbedtls_mpi_bitlen(const sc_mbedtls_mpi *X);
-
-/**
- * \brief          Return the total size in bytes
- *
- * \param X        MPI to use
- */
-size_t sc_mbedtls_mpi_size(const sc_mbedtls_mpi *X);
-
-/**
- * \brief          Import from an ASCII string
- *
- * \param X        Destination MPI
- * \param radix    Input numeric base
- * \param s        Null-terminated string buffer
- *
- * \return         0 if successful, or a SC_MBEDTLS_ERR_MPI_XXX error code
- */
-int sc_mbedtls_mpi_read_string(sc_mbedtls_mpi *X, int radix, const char *s);
-
-/**
- * \brief          Export into an ASCII string
- *
- * \param X        Source MPI
- * \param radix    Output numeric base
- * \param buf      Buffer to write the string to
- * \param buflen   Length of buf
- * \param olen     Length of the string written, including final NUL byte
- *
- * \return         0 if successful, or a SC_MBEDTLS_ERR_MPI_XXX error code.
- *                 *olen is always updated to reflect the amount
- *                 of data that has (or would have) been written.
- *
- * \note           Call this function with buflen = 0 to obtain the
- *                 minimum required buffer size in *olen.
- */
-int sc_mbedtls_mpi_write_string(const sc_mbedtls_mpi *X, int radix, char *buf, size_t buflen,
-                                 size_t *olen);
-
-/**
- * \brief          Import X from unsigned binary data, big endian
- *
- * \param X        Destination MPI
- * \param buf      Input buffer
- * \param buflen   Input buffer size
- *
- * \return         0 if successful,
- *                 SC_MBEDTLS_ERR_MPI_ALLOC_FAILED if memory allocation failed
- */
-int sc_mbedtls_mpi_read_binary(sc_mbedtls_mpi *X, const unsigned char *buf, size_t buflen);
-
-/**
- * \brief          Export X into unsigned binary data, big endian.
- *                 Always fills the whole buffer, which will start with zeros
- *                 if the number is smaller.
- *
- * \param X        Source MPI
- * \param buf      Output buffer
- * \param buflen   Output buffer size
- *
- * \return         0 if successful,
- *                 SC_MBEDTLS_ERR_MPI_BUFFER_TOO_SMALL if buf isn't large enough
- */
-int sc_mbedtls_mpi_write_binary(const sc_mbedtls_mpi *X, unsigned char *buf, size_t buflen);
-
-/**
- * \brief          Left-shift: X <<= count
- *
- * \param X        MPI to shift
- * \param count    Amount to shift
- *
- * \return         0 if successful,
- *                 SC_MBEDTLS_ERR_MPI_ALLOC_FAILED if memory allocation failed
- */
-int sc_mbedtls_mpi_shift_l(sc_mbedtls_mpi *X, size_t count);
-
-/**
- * \brief          Right-shift: X >>= count
- *
- * \param X        MPI to shift
- * \param count    Amount to shift
- *
- * \return         0 if successful,
- *                 SC_MBEDTLS_ERR_MPI_ALLOC_FAILED if memory allocation failed
- */
-int sc_mbedtls_mpi_shift_r(sc_mbedtls_mpi *X, size_t count);
-
-/**
- * \brief          Compare unsigned values
- *
- * \param X        Left-hand MPI
- * \param Y        Right-hand MPI
- *
- * \return         1 if |X| is greater than |Y|,
- *                -1 if |X| is lesser  than |Y| or
- *                 0 if |X| is equal to |Y|
- */
-int sc_mbedtls_mpi_cmp_abs(const sc_mbedtls_mpi *X, const sc_mbedtls_mpi *Y);
-
-/**
- * \brief          Compare signed values
- *
- * \param X        Left-hand MPI
- * \param Y        Right-hand MPI
- *
- * \return         1 if X is greater than Y,
- *                -1 if X is lesser  than Y or
- *                 0 if X is equal to Y
- */
-int sc_mbedtls_mpi_cmp_mpi(const sc_mbedtls_mpi *X, const sc_mbedtls_mpi *Y);
-
-/**
- * \brief          Compare signed values
- *
- * \param X        Left-hand MPI
- * \param z        The integer value to compare to
- *
- * \return         1 if X is greater than z,
- *                -1 if X is lesser  than z or
- *                 0 if X is equal to z
- */
-int sc_mbedtls_mpi_cmp_int(const sc_mbedtls_mpi *X, sc_mbedtls_mpi_sint z);
-
-/**
- * \brief          Unsigned addition: X = |A| + |B|
- *
- * \param X        Destination MPI
- * \param A        Left-hand MPI
- * \param B        Right-hand MPI
- *
- * \return         0 if successful,
- *                 SC_MBEDTLS_ERR_MPI_ALLOC_FAILED if memory allocation failed
- */
-int sc_mbedtls_mpi_add_abs(sc_mbedtls_mpi *X, const sc_mbedtls_mpi *A, const sc_mbedtls_mpi *B);
-
-/**
- * \brief          Unsigned subtraction: X = |A| - |B|
- *
- * \param X        Destination MPI
- * \param A        Left-hand MPI
- * \param B        Right-hand MPI
- *
- * \return         0 if successful,
- *                 SC_MBEDTLS_ERR_MPI_NEGATIVE_VALUE if B is greater than A
- */
-int sc_mbedtls_mpi_sub_abs(sc_mbedtls_mpi *X, const sc_mbedtls_mpi *A, const sc_mbedtls_mpi *B);
-
-/**
- * \brief          Signed addition: X = A + B
- *
- * \param X        Destination MPI
- * \param A        Left-hand MPI
- * \param B        Right-hand MPI
- *
- * \return         0 if successful,
- *                 SC_MBEDTLS_ERR_MPI_ALLOC_FAILED if memory allocation failed
- */
-int sc_mbedtls_mpi_add_mpi(sc_mbedtls_mpi *X, const sc_mbedtls_mpi *A, const sc_mbedtls_mpi *B);
-
-/**
- * \brief          Signed subtraction: X = A - B
- *
- * \param X        Destination MPI
- * \param A        Left-hand MPI
- * \param B        Right-hand MPI
- *
- * \return         0 if successful,
- *                 SC_MBEDTLS_ERR_MPI_ALLOC_FAILED if memory allocation failed
- */
-int sc_mbedtls_mpi_sub_mpi(sc_mbedtls_mpi *X, const sc_mbedtls_mpi *A, const sc_mbedtls_mpi *B);
-
-/**
- * \brief          Signed addition: X = A + b
- *
- * \param X        Destination MPI
- * \param A        Left-hand MPI
- * \param b        The integer value to add
- *
- * \return         0 if successful,
- *                 SC_MBEDTLS_ERR_MPI_ALLOC_FAILED if memory allocation failed
- */
-int sc_mbedtls_mpi_add_int(sc_mbedtls_mpi *X, const sc_mbedtls_mpi *A, sc_mbedtls_mpi_sint b);
-
-/**
- * \brief          Signed subtraction: X = A - b
- *
- * \param X        Destination MPI
- * \param A        Left-hand MPI
- * \param b        The integer value to subtract
- *
- * \return         0 if successful,
- *                 SC_MBEDTLS_ERR_MPI_ALLOC_FAILED if memory allocation failed
- */
-int sc_mbedtls_mpi_sub_int(sc_mbedtls_mpi *X, const sc_mbedtls_mpi *A, sc_mbedtls_mpi_sint b);
-
-/**
- * \brief          Baseline multiplication: X = A * B
- *
- * \param X        Destination MPI
- * \param A        Left-hand MPI
- * \param B        Right-hand MPI
- *
- * \return         0 if successful,
- *                 SC_MBEDTLS_ERR_MPI_ALLOC_FAILED if memory allocation failed
- */
-int sc_mbedtls_mpi_mul_mpi(sc_mbedtls_mpi *X, const sc_mbedtls_mpi *A, const sc_mbedtls_mpi *B);
-
-/**
- * \brief          Baseline multiplication: X = A * b
- *
- * \param X        Destination MPI
- * \param A        Left-hand MPI
- * \param b        The unsigned integer value to multiply with
- *
- * \note           b is unsigned
- *
- * \return         0 if successful,
- *                 SC_MBEDTLS_ERR_MPI_ALLOC_FAILED if memory allocation failed
- */
-int sc_mbedtls_mpi_mul_int(sc_mbedtls_mpi *X, const sc_mbedtls_mpi *A, sc_mbedtls_mpi_uint b);
-
-/**
- * \brief          Division by sc_mbedtls_mpi: A = Q * B + R
- *
- * \param Q        Destination MPI for the quotient
- * \param R        Destination MPI for the rest value
- * \param A        Left-hand MPI
- * \param B        Right-hand MPI
- *
- * \return         0 if successful,
- *                 SC_MBEDTLS_ERR_MPI_ALLOC_FAILED if memory allocation failed,
- *                 SC_MBEDTLS_ERR_MPI_DIVISION_BY_ZERO if B == 0
- *
- * \note           Either Q or R can be NULL.
- */
-int sc_mbedtls_mpi_div_mpi(sc_mbedtls_mpi *Q, sc_mbedtls_mpi *R, const sc_mbedtls_mpi *A,
-                            const sc_mbedtls_mpi *B);
-
-/**
- * \brief          Division by int: A = Q * b + R
- *
- * \param Q        Destination MPI for the quotient
- * \param R        Destination MPI for the rest value
- * \param A        Left-hand MPI
- * \param b        Integer to divide by
- *
- * \return         0 if successful,
- *                 SC_MBEDTLS_ERR_MPI_ALLOC_FAILED if memory allocation failed,
- *                 SC_MBEDTLS_ERR_MPI_DIVISION_BY_ZERO if b == 0
- *
- * \note           Either Q or R can be NULL.
- */
-int sc_mbedtls_mpi_div_int(sc_mbedtls_mpi *Q, sc_mbedtls_mpi *R, const sc_mbedtls_mpi *A,
-                            sc_mbedtls_mpi_sint b);
-
-/**
- * \brief          Modulo: R = A mod B
- *
- * \param R        Destination MPI for the rest value
- * \param A        Left-hand MPI
- * \param B        Right-hand MPI
- *
- * \return         0 if successful,
- *                 SC_MBEDTLS_ERR_MPI_ALLOC_FAILED if memory allocation failed,
- *                 SC_MBEDTLS_ERR_MPI_DIVISION_BY_ZERO if B == 0,
- *                 SC_MBEDTLS_ERR_MPI_NEGATIVE_VALUE if B < 0
- */
-int sc_mbedtls_mpi_mod_mpi(sc_mbedtls_mpi *R, const sc_mbedtls_mpi *A, const sc_mbedtls_mpi *B);
-
-/**
- * \brief          Modulo: r = A mod b
- *
- * \param r        Destination sc_mbedtls_mpi_uint
- * \param A        Left-hand MPI
- * \param b        Integer to divide by
- *
- * \return         0 if successful,
- *                 SC_MBEDTLS_ERR_MPI_ALLOC_FAILED if memory allocation failed,
- *                 SC_MBEDTLS_ERR_MPI_DIVISION_BY_ZERO if b == 0,
- *                 SC_MBEDTLS_ERR_MPI_NEGATIVE_VALUE if b < 0
- */
-int sc_mbedtls_mpi_mod_int(sc_mbedtls_mpi_uint *r, const sc_mbedtls_mpi *A,
-                            sc_mbedtls_mpi_sint b);
-
-/**
- * \brief          Sliding-window exponentiation: X = A^E mod N
- *
- * \param X        Destination MPI
- * \param A        Left-hand MPI
- * \param E        Exponent MPI
- * \param N        Modular MPI
- * \param _RR      Speed-up MPI used for recalculations
- *
- * \return         0 if successful,
- *                 SC_MBEDTLS_ERR_MPI_ALLOC_FAILED if memory allocation failed,
- *                 SC_MBEDTLS_ERR_MPI_BAD_INPUT_DATA if N is negative or even or
- *                 if E is negative
- *
- * \note           _RR is used to avoid re-computing R*R mod N across
- *                 multiple calls, which speeds up things a bit. It can
- *                 be set to NULL if the extra performance is unneeded.
- */
-int sc_mbedtls_mpi_exp_mod(sc_mbedtls_mpi *X, const sc_mbedtls_mpi *A, const sc_mbedtls_mpi *E,
-                            const sc_mbedtls_mpi *N, sc_mbedtls_mpi *_RR);
-
-/**
- * \brief          Fill an MPI X with size bytes of random
- *
- * \param X        Destination MPI
- * \param size     Size in bytes
- * \param f_rng    RNG function
- * \param p_rng    RNG parameter
- *
- * \return         0 if successful,
- *                 SC_MBEDTLS_ERR_MPI_ALLOC_FAILED if memory allocation failed
- */
-int sc_mbedtls_mpi_fill_random(sc_mbedtls_mpi *X, size_t                           size,
-                                int (*f_rng)(void *, unsigned char *, size_t), void *p_rng);
-
-/**
- * \brief          Greatest common divisor: G = gcd(A, B)
- *
- * \param G        Destination MPI
- * \param A        Left-hand MPI
- * \param B        Right-hand MPI
- *
- * \return         0 if successful,
- *                 SC_MBEDTLS_ERR_MPI_ALLOC_FAILED if memory allocation failed
- */
-int sc_mbedtls_mpi_gcd(sc_mbedtls_mpi *G, const sc_mbedtls_mpi *A, const sc_mbedtls_mpi *B);
-
-/**
- * \brief          Modular inverse: X = A^-1 mod N
- *
- * \param X        Destination MPI
- * \param A        Left-hand MPI
- * \param N        Right-hand MPI
- *
- * \return         0 if successful,
- *                 SC_MBEDTLS_ERR_MPI_ALLOC_FAILED if memory allocation failed,
- *                 SC_MBEDTLS_ERR_MPI_BAD_INPUT_DATA if N is <= 1,
-                   SC_MBEDTLS_ERR_MPI_NOT_ACCEPTABLE if A has no inverse mod N.
- */
-int sc_mbedtls_mpi_inv_mod(sc_mbedtls_mpi *X, const sc_mbedtls_mpi *A, const sc_mbedtls_mpi *N);
-
-/**
- * \brief          Miller-Rabin primality test
- *
- * \param X        MPI to check
- * \param f_rng    RNG function
- * \param p_rng    RNG parameter
- *
- * \return         0 if successful (probably prime),
- *                 SC_MBEDTLS_ERR_MPI_ALLOC_FAILED if memory allocation failed,
- *                 SC_MBEDTLS_ERR_MPI_NOT_ACCEPTABLE if X is not prime
- */
-int sc_mbedtls_mpi_is_prime(const sc_mbedtls_mpi *X,
-                             int (*f_rng)(void *, unsigned char *, size_t), void *p_rng);
-
-/**
- * \brief          Prime number generation
- *
- * \param X        Destination MPI
- * \param nbits    Required size of X in bits
- *                 ( 3 <= nbits <= SC_MBEDTLS_MPI_MAX_BITS )
- * \param dh_flag  If 1, then (X-1)/2 will be prime too
- * \param f_rng    RNG function
- * \param p_rng    RNG parameter
- *
- * \return         0 if successful (probably prime),
- *                 SC_MBEDTLS_ERR_MPI_ALLOC_FAILED if memory allocation failed,
- *                 SC_MBEDTLS_ERR_MPI_BAD_INPUT_DATA if nbits is < 3
- */
-int sc_mbedtls_mpi_gen_prime(sc_mbedtls_mpi *X, size_t nbits, int dh_flag,
-                              int (*f_rng)(void *, unsigned char *, size_t), void *p_rng);
-
-/**
- * \brief          Checkup routine
- *
- * \return         0 if successful, or 1 if the test failed
- */
-int sc_mbedtls_mpi_self_test(int verbose);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* bignum.h */
--- a/lib/sec_library/include/soft_crypto/crypto_bn_mul.h
+++ b/lib/sec_library/include/soft_crypto/crypto_bn_mul.h
@@ -1,70 +0,0 @@
-/**
- * \file bn_mul.h
- *
- * \brief  Multi-precision integer library
- *
- *  Copyright (C) 2006-2015, ARM Limited, All Rights Reserved
- *  SPDX-License-Identifier: Apache-2.0
- *
- *  Licensed under the Apache License, Version 2.0 (the "License"); you may
- *  not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
- *
- *  http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- *  WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- *
- *  This file is part of mbed TLS (https://tls.mbed.org)
- */
-/*
- *      Multiply source vector [s] with b, add result
- *       to destination vector [d] and set carry c.
- *
- *      Currently supports:
- *
- *         . IA-32 (386+)         . AMD64 / EM64T
- *         . IA-32 (SSE2)         . Motorola 68000
- *         . PowerPC, 32-bit      . MicroBlaze
- *         . PowerPC, 64-bit      . TriCore
- *         . SPARC v8             . ARM v3+
- *         . Alpha                . MIPS32
- *         . C, longlong          . C, generic
- */
-#ifndef SC_MBEDTLS_BN_MUL_H
-#define SC_MBEDTLS_BN_MUL_H
-
-#include "crypto_bignum.h"
-
-#if !defined(MULADDC_CORE)
-
-#define MULADDC_INIT                    \
-{                                       \
-    sc_mbedtls_mpi_uint s0, s1, b0, b1;              \
-    sc_mbedtls_mpi_uint r0, r1, rx, ry;              \
-    b0 = ( b << biH ) >> biH;           \
-    b1 = ( b >> biH );
-
-#define MULADDC_CORE                    \
-    s0 = ( *s << biH ) >> biH;          \
-    s1 = ( *s >> biH ); s++;            \
-    rx = s0 * b1; r0 = s0 * b0;         \
-    ry = s1 * b0; r1 = s1 * b1;         \
-    r1 += ( rx >> biH );                \
-    r1 += ( ry >> biH );                \
-    rx <<= biH; ry <<= biH;             \
-    r0 += rx; r1 += (r0 < rx);          \
-    r0 += ry; r1 += (r0 < ry);          \
-    r0 +=  c; r1 += (r0 <  c);          \
-    r0 += *d; r1 += (r0 < *d);          \
-    c = r1; *(d++) = r0;
-
-#define MULADDC_STOP                    \
-}
-
-#endif /* C (generic)  */
-
-#endif /* bn_mul.h */
--- a/lib/sec_library/include/soft_crypto/crypto_ccm.h
+++ b/lib/sec_library/include/soft_crypto/crypto_ccm.h
@@ -1,308 +0,0 @@
-/**
- * \file ccm.h
- *
- * \brief This file provides an API for the CCM authenticated encryption
- *        mode for block ciphers.
- *
- * CCM combines Counter mode encryption with CBC-MAC authentication
- * for 128-bit block ciphers.
- *
- * Input to CCM includes the following elements:
- * <ul><li>Payload - data that is both authenticated and encrypted.</li>
- * <li>Associated data (Adata) - data that is authenticated but not
- * encrypted, For example, a header.</li>
- * <li>Nonce - A unique value that is assigned to the payload and the
- * associated data.</li></ul>
- *
- * Definition of CCM:
- * http://csrc.nist.gov/publications/nistpubs/800-38C/SP800-38C_updated-July20_2007.pdf
- * RFC 3610 "Counter with CBC-MAC (CCM)"
- *
- * Related:
- * RFC 5116 "An Interface and Algorithms for Authenticated Encryption"
- *
- * Definition of CCM*:
- * IEEE 802.15.4 - IEEE Standard for Local and metropolitan area networks
- * Integer representation is fixed most-significant-octet-first order and
- * the representation of octets is most-significant-bit-first order. This is
- * consistent with RFC 3610.
- */
-/*
- *  Copyright The Mbed TLS Contributors
- *  SPDX-License-Identifier: Apache-2.0
- *
- *  Licensed under the Apache License, Version 2.0 (the "License"); you may
- *  not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
- *
- *  http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- *  WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-
-#ifndef MBEDTLS_CCM_H
-#define MBEDTLS_CCM_H
-
-#if !defined(MBEDTLS_CONFIG_FILE)
-#include "mbedtls/config.h"
-#else
-#include MBEDTLS_CONFIG_FILE
-#endif
-
-#include "mbedtls/cipher.h"
-
-#define MBEDTLS_ERR_CCM_BAD_INPUT       -0x000D /**< Bad input parameters to the function. */
-#define MBEDTLS_ERR_CCM_AUTH_FAILED     -0x000F /**< Authenticated decryption failed. */
-
-/* MBEDTLS_ERR_CCM_HW_ACCEL_FAILED is deprecated and should not be used. */
-#define MBEDTLS_ERR_CCM_HW_ACCEL_FAILED -0x0011 /**< CCM hardware accelerator failed. */
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#if !defined(MBEDTLS_CCM_ALT)
-// Regular implementation
-//
-
-/**
- * \brief    The CCM context-type definition. The CCM context is passed
- *           to the APIs called.
- */
-typedef struct mbedtls_ccm_context
-{
-    mbedtls_cipher_context_t cipher_ctx;    /*!< The cipher context used. */
-}
-mbedtls_ccm_context;
-
-#else  /* MBEDTLS_CCM_ALT */
-#include "ccm_alt.h"
-#endif /* MBEDTLS_CCM_ALT */
-
-/**
- * \brief           This function initializes the specified CCM context,
- *                  to make references valid, and prepare the context
- *                  for sc_mbedtls_ccm_setkey() or sc_mbedtls_ccm_free().
- *
- * \param ctx       The CCM context to initialize. This must not be \c NULL.
- */
-void sc_mbedtls_ccm_init( mbedtls_ccm_context *ctx );
-
-/**
- * \brief           This function initializes the CCM context set in the
- *                  \p ctx parameter and sets the encryption key.
- *
- * \param ctx       The CCM context to initialize. This must be an initialized
- *                  context.
- * \param cipher    The 128-bit block cipher to use.
- * \param key       The encryption key. This must not be \c NULL.
- * \param keybits   The key size in bits. This must be acceptable by the cipher.
- *
- * \return          \c 0 on success.
- * \return          A CCM or cipher-specific error code on failure.
- */
-int sc_mbedtls_ccm_setkey( mbedtls_ccm_context *ctx,
-                        mbedtls_cipher_id_t cipher,
-                        const unsigned char *key,
-                        unsigned int keybits );
-
-/**
- * \brief   This function releases and clears the specified CCM context
- *          and underlying cipher sub-context.
- *
- * \param ctx       The CCM context to clear. If this is \c NULL, the function
- *                  has no effect. Otherwise, this must be initialized.
- */
-void sc_mbedtls_ccm_free( mbedtls_ccm_context *ctx );
-
-/**
- * \brief           This function encrypts a buffer using CCM.
- *
- * \note            The tag is written to a separate buffer. To concatenate
- *                  the \p tag with the \p output, as done in <em>RFC-3610:
- *                  Counter with CBC-MAC (CCM)</em>, use
- *                  \p tag = \p output + \p length, and make sure that the
- *                  output buffer is at least \p length + \p tag_len wide.
- *
- * \param ctx       The CCM context to use for encryption. This must be
- *                  initialized and bound to a key.
- * \param length    The length of the input data in Bytes.
- * \param iv        The initialization vector (nonce). This must be a readable
- *                  buffer of at least \p iv_len Bytes.
- * \param iv_len    The length of the nonce in Bytes: 7, 8, 9, 10, 11, 12,
- *                  or 13. The length L of the message length field is
- *                  15 - \p iv_len.
- * \param add       The additional data field. If \p add_len is greater than
- *                  zero, \p add must be a readable buffer of at least that
- *                  length.
- * \param add_len   The length of additional data in Bytes.
- *                  This must be less than `2^16 - 2^8`.
- * \param input     The buffer holding the input data. If \p length is greater
- *                  than zero, \p input must be a readable buffer of at least
- *                  that length.
- * \param output    The buffer holding the output data. If \p length is greater
- *                  than zero, \p output must be a writable buffer of at least
- *                  that length.
- * \param tag       The buffer holding the authentication field. This must be a
- *                  writable buffer of at least \p tag_len Bytes.
- * \param tag_len   The length of the authentication field to generate in Bytes:
- *                  4, 6, 8, 10, 12, 14 or 16.
- *
- * \return          \c 0 on success.
- * \return          A CCM or cipher-specific error code on failure.
- */
-int sc_mbedtls_ccm_encrypt_and_tag( mbedtls_ccm_context *ctx, size_t length,
-                         const unsigned char *iv, size_t iv_len,
-                         const unsigned char *add, size_t add_len,
-                         const unsigned char *input, unsigned char *output,
-                         unsigned char *tag, size_t tag_len );
-
-/**
- * \brief           This function encrypts a buffer using CCM*.
- *
- * \note            The tag is written to a separate buffer. To concatenate
- *                  the \p tag with the \p output, as done in <em>RFC-3610:
- *                  Counter with CBC-MAC (CCM)</em>, use
- *                  \p tag = \p output + \p length, and make sure that the
- *                  output buffer is at least \p length + \p tag_len wide.
- *
- * \note            When using this function in a variable tag length context,
- *                  the tag length has to be encoded into the \p iv passed to
- *                  this function.
- *
- * \param ctx       The CCM context to use for encryption. This must be
- *                  initialized and bound to a key.
- * \param length    The length of the input data in Bytes.
- * \param iv        The initialization vector (nonce). This must be a readable
- *                  buffer of at least \p iv_len Bytes.
- * \param iv_len    The length of the nonce in Bytes: 7, 8, 9, 10, 11, 12,
- *                  or 13. The length L of the message length field is
- *                  15 - \p iv_len.
- * \param add       The additional data field. This must be a readable buffer of
- *                  at least \p add_len Bytes.
- * \param add_len   The length of additional data in Bytes.
- *                  This must be less than 2^16 - 2^8.
- * \param input     The buffer holding the input data. If \p length is greater
- *                  than zero, \p input must be a readable buffer of at least
- *                  that length.
- * \param output    The buffer holding the output data. If \p length is greater
- *                  than zero, \p output must be a writable buffer of at least
- *                  that length.
- * \param tag       The buffer holding the authentication field. This must be a
- *                  writable buffer of at least \p tag_len Bytes.
- * \param tag_len   The length of the authentication field to generate in Bytes:
- *                  0, 4, 6, 8, 10, 12, 14 or 16.
- *
- * \warning         Passing \c 0 as \p tag_len means that the message is no
- *                  longer authenticated.
- *
- * \return          \c 0 on success.
- * \return          A CCM or cipher-specific error code on failure.
- */
-int sc_mbedtls_ccm_star_encrypt_and_tag( mbedtls_ccm_context *ctx, size_t length,
-                         const unsigned char *iv, size_t iv_len,
-                         const unsigned char *add, size_t add_len,
-                         const unsigned char *input, unsigned char *output,
-                         unsigned char *tag, size_t tag_len );
-
-/**
- * \brief           This function performs a CCM authenticated decryption of a
- *                  buffer.
- *
- * \param ctx       The CCM context to use for decryption. This must be
- *                  initialized and bound to a key.
- * \param length    The length of the input data in Bytes.
- * \param iv        The initialization vector (nonce). This must be a readable
- *                  buffer of at least \p iv_len Bytes.
- * \param iv_len    The length of the nonce in Bytes: 7, 8, 9, 10, 11, 12,
- *                  or 13. The length L of the message length field is
- *                  15 - \p iv_len.
- * \param add       The additional data field. This must be a readable buffer
- *                  of at least that \p add_len Bytes..
- * \param add_len   The length of additional data in Bytes.
- *                  This must be less than 2^16 - 2^8.
- * \param input     The buffer holding the input data. If \p length is greater
- *                  than zero, \p input must be a readable buffer of at least
- *                  that length.
- * \param output    The buffer holding the output data. If \p length is greater
- *                  than zero, \p output must be a writable buffer of at least
- *                  that length.
- * \param tag       The buffer holding the authentication field. This must be a
- *                  readable buffer of at least \p tag_len Bytes.
- * \param tag_len   The length of the authentication field to generate in Bytes:
- *                  4, 6, 8, 10, 12, 14 or 16.
- *
- * \return          \c 0 on success. This indicates that the message is authentic.
- * \return          #MBEDTLS_ERR_CCM_AUTH_FAILED if the tag does not match.
- * \return          A cipher-specific error code on calculation failure.
- */
-int sc_mbedtls_ccm_auth_decrypt( mbedtls_ccm_context *ctx, size_t length,
-                      const unsigned char *iv, size_t iv_len,
-                      const unsigned char *add, size_t add_len,
-                      const unsigned char *input, unsigned char *output,
-                      const unsigned char *tag, size_t tag_len );
-
-/**
- * \brief           This function performs a CCM* authenticated decryption of a
- *                  buffer.
- *
- * \note            When using this function in a variable tag length context,
- *                  the tag length has to be decoded from \p iv and passed to
- *                  this function as \p tag_len. (\p tag needs to be adjusted
- *                  accordingly.)
- *
- * \param ctx       The CCM context to use for decryption. This must be
- *                  initialized and bound to a key.
- * \param length    The length of the input data in Bytes.
- * \param iv        The initialization vector (nonce). This must be a readable
- *                  buffer of at least \p iv_len Bytes.
- * \param iv_len    The length of the nonce in Bytes: 7, 8, 9, 10, 11, 12,
- *                  or 13. The length L of the message length field is
- *                  15 - \p iv_len.
- * \param add       The additional data field. This must be a readable buffer of
- *                  at least that \p add_len Bytes.
- * \param add_len   The length of additional data in Bytes.
- *                  This must be less than 2^16 - 2^8.
- * \param input     The buffer holding the input data. If \p length is greater
- *                  than zero, \p input must be a readable buffer of at least
- *                  that length.
- * \param output    The buffer holding the output data. If \p length is greater
- *                  than zero, \p output must be a writable buffer of at least
- *                  that length.
- * \param tag       The buffer holding the authentication field. This must be a
- *                  readable buffer of at least \p tag_len Bytes.
- * \param tag_len   The length of the authentication field in Bytes.
- *                  0, 4, 6, 8, 10, 12, 14 or 16.
- *
- * \warning         Passing \c 0 as \p tag_len means that the message is nos
- *                  longer authenticated.
- *
- * \return          \c 0 on success.
- * \return          #MBEDTLS_ERR_CCM_AUTH_FAILED if the tag does not match.
- * \return          A cipher-specific error code on calculation failure.
- */
-int sc_mbedtls_ccm_star_auth_decrypt( mbedtls_ccm_context *ctx, size_t length,
-                      const unsigned char *iv, size_t iv_len,
-                      const unsigned char *add, size_t add_len,
-                      const unsigned char *input, unsigned char *output,
-                      const unsigned char *tag, size_t tag_len );
-
-#if defined(MBEDTLS_SELF_TEST) && defined(MBEDTLS_AES_C)
-/**
- * \brief          The CCM checkup routine.
- *
- * \return         \c 0 on success.
- * \return         \c 1 on failure.
- */
-int sc_mbedtls_ccm_self_test( int verbose );
-#endif /* MBEDTLS_SELF_TEST && MBEDTLS_AES_C */
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* MBEDTLS_CCM_H */
--- a/lib/sec_library/include/soft_crypto/crypto_cipher.h
+++ b/lib/sec_library/include/soft_crypto/crypto_cipher.h
--- a/lib/sec_library/include/soft_crypto/crypto_cipher_internal.h
+++ b/lib/sec_library/include/soft_crypto/crypto_cipher_internal.h
@@ -1,125 +0,0 @@
-/**
- * \file cipher_internal.h
- *
- * \brief Cipher wrappers.
- *
- * \author Adriaan de Jong <dejong@fox-it.com>
- */
-/*
- *  Copyright (C) 2006-2015, ARM Limited, All Rights Reserved
- *  SPDX-License-Identifier: Apache-2.0
- *
- *  Licensed under the Apache License, Version 2.0 (the "License"); you may
- *  not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
- *
- *  http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- *  WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- *
- *  This file is part of mbed TLS (https://tls.mbed.org)
- */
-#ifndef MBEDTLS_CIPHER_WRAP_H
-#define MBEDTLS_CIPHER_WRAP_H
-
-#if !defined(MBEDTLS_CONFIG_FILE)
-#include "crypto_config.h"
-#else
-#include MBEDTLS_CONFIG_FILE
-#endif
-
-#include "crypto_cipher.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/**
- * Base cipher information. The non-mode specific functions and values.
- */
-struct mbedtls_cipher_base_t
-{
-    /** Base Cipher type (e.g. MBEDTLS_CIPHER_ID_AES) */
-    mbedtls_cipher_id_t cipher;
-
-    /** Encrypt using ECB */
-    int (*ecb_func)( void *ctx, mbedtls_operation_t mode,
-                     const unsigned char *input, unsigned char *output );
-
-#if defined(MBEDTLS_CIPHER_MODE_CBC)
-    /** Encrypt using CBC */
-    int (*cbc_func)( void *ctx, mbedtls_operation_t mode, size_t length,
-                     unsigned char *iv, const unsigned char *input,
-                     unsigned char *output );
-#endif
-
-#if defined(MBEDTLS_CIPHER_MODE_CFB)
-    /** Encrypt using CFB (Full length) */
-    int (*cfb_func)( void *ctx, mbedtls_operation_t mode, size_t length, size_t *iv_off,
-                     unsigned char *iv, const unsigned char *input,
-                     unsigned char *output );
-#endif
-
-#if defined(MBEDTLS_CIPHER_MODE_OFB)
-    /** Encrypt using OFB (Full length) */
-    int (*ofb_func)( void *ctx, size_t length, size_t *iv_off,
-                     unsigned char *iv,
-                     const unsigned char *input,
-                     unsigned char *output );
-#endif
-
-#if defined(MBEDTLS_CIPHER_MODE_CTR)
-    /** Encrypt using CTR */
-    int (*ctr_func)( void *ctx, size_t length, size_t *nc_off,
-                     unsigned char *nonce_counter, unsigned char *stream_block,
-                     const unsigned char *input, unsigned char *output );
-#endif
-
-#if defined(MBEDTLS_CIPHER_MODE_XTS)
-    /** Encrypt or decrypt using XTS. */
-    int (*xts_func)( void *ctx, mbedtls_operation_t mode, size_t length,
-                     const unsigned char data_unit[16],
-                     const unsigned char *input, unsigned char *output );
-#endif
-
-#if defined(MBEDTLS_CIPHER_MODE_STREAM)
-    /** Encrypt using STREAM */
-    int (*stream_func)( void *ctx, size_t length,
-                        const unsigned char *input, unsigned char *output );
-#endif
-
-    /** Set key for encryption purposes */
-    int (*setkey_enc_func)( void *ctx, const unsigned char *key,
-                            unsigned int key_bitlen );
-
-    /** Set key for decryption purposes */
-    int (*setkey_dec_func)( void *ctx, const unsigned char *key,
-                            unsigned int key_bitlen);
-
-    /** Allocate a new context */
-    void * (*ctx_alloc_func)( void );
-
-    /** Free the given context */
-    void (*ctx_free_func)( void *ctx );
-
-};
-
-typedef struct
-{
-    mbedtls_cipher_type_t type;
-    const mbedtls_cipher_info_t *info;
-} mbedtls_cipher_definition_t;
-
-extern const mbedtls_cipher_definition_t mbedtls_cipher_definitions[];
-
-extern int mbedtls_cipher_supported[];
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* MBEDTLS_CIPHER_WRAP_H */
--- a/lib/sec_library/include/soft_crypto/crypto_cmac.h
+++ b/lib/sec_library/include/soft_crypto/crypto_cmac.h
@@ -1,242 +0,0 @@
-/**
- * \file cmac.h
- *
- * \brief This file contains CMAC definitions and functions.
- *
- * The Cipher-based Message Authentication Code (CMAC) Mode for
- * Authentication is defined in <em>RFC-4493: The AES-CMAC Algorithm</em>.
- */
-/*
- *  Copyright The Mbed TLS Contributors
- *  SPDX-License-Identifier: Apache-2.0
- *
- *  Licensed under the Apache License, Version 2.0 (the "License"); you may
- *  not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
- *
- *  http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- *  WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-
-#ifndef MBEDTLS_CMAC_H
-#define MBEDTLS_CMAC_H
-
-#if !defined(MBEDTLS_CONFIG_FILE)
-#include "mbedtls/config.h"
-#else
-#include MBEDTLS_CONFIG_FILE
-#endif
-
-#include "mbedtls/cipher.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* MBEDTLS_ERR_CMAC_HW_ACCEL_FAILED is deprecated and should not be used. */
-#define MBEDTLS_ERR_CMAC_HW_ACCEL_FAILED -0x007A  /**< CMAC hardware accelerator failed. */
-
-#define MBEDTLS_AES_BLOCK_SIZE          16
-#define MBEDTLS_DES3_BLOCK_SIZE         8
-
-#if defined(MBEDTLS_AES_C)
-#define MBEDTLS_CIPHER_BLKSIZE_MAX      16  /**< The longest block used by CMAC is that of AES. */
-#else
-#define MBEDTLS_CIPHER_BLKSIZE_MAX      8   /**< The longest block used by CMAC is that of 3DES. */
-#endif
-
-#if !defined(MBEDTLS_CMAC_ALT)
-
-/**
- * The CMAC context structure.
- */
-struct mbedtls_cmac_context_t
-{
-    /** The internal state of the CMAC algorithm.  */
-    unsigned char       state[MBEDTLS_CIPHER_BLKSIZE_MAX];
-
-    /** Unprocessed data - either data that was not block aligned and is still
-     *  pending processing, or the final block. */
-    unsigned char       unprocessed_block[MBEDTLS_CIPHER_BLKSIZE_MAX];
-
-    /** The length of data pending processing. */
-    size_t              unprocessed_len;
-};
-
-#else  /* !MBEDTLS_CMAC_ALT */
-#include "cmac_alt.h"
-#endif /* !MBEDTLS_CMAC_ALT */
-
-/**
- * \brief               Initialises and allocat cmac context memory
- *                      Must be called with an initialized cipher context.
- *
- * \param ctx           The cipher context used for the CMAC operation, initialized
- *                      as one of the following types: MBEDTLS_CIPHER_AES_128_ECB,
- *                      MBEDTLS_CIPHER_AES_192_ECB, MBEDTLS_CIPHER_AES_256_ECB,
- *                      or MBEDTLS_CIPHER_DES_EDE3_ECB.
- * \return              \c 0 on success.
- * \return              A cipher-specific error code on failure.
- */
-int sc_mbedtls_cipher_cmac_setup(mbedtls_cipher_context_t *ctx);
-
-/**
- * \brief               This function sets the CMAC key, and prepares to authenticate
- *                      the input data.
- *                      Must be called with an initialized cipher context.
- *
- * \note                When the CMAC implementation is supplied by an alternate
- *                      implementation (through #MBEDTLS_CMAC_ALT), some ciphers
- *                      may not be supported by that implementation, and thus
- *                      return an error. Alternate implementations must support
- *                      AES-128 and AES-256, and may support AES-192 and 3DES.
- *
- * \param ctx           The cipher context used for the CMAC operation, initialized
- *                      as one of the following types: MBEDTLS_CIPHER_AES_128_ECB,
- *                      MBEDTLS_CIPHER_AES_192_ECB, MBEDTLS_CIPHER_AES_256_ECB,
- *                      or MBEDTLS_CIPHER_DES_EDE3_ECB.
- * \param key           The CMAC key.
- * \param keybits       The length of the CMAC key in bits.
- *                      Must be supported by the cipher.
- *
- * \return              \c 0 on success.
- * \return              A cipher-specific error code on failure.
- */
-int sc_mbedtls_cipher_cmac_starts( mbedtls_cipher_context_t *ctx,
-                                const unsigned char *key, size_t keybits );
-
-/**
- * \brief               This function feeds an input buffer into an ongoing CMAC
- *                      computation.
- *
- *                      It is called between sc_mbedtls_cipher_cmac_starts() or
- *                      sc_mbedtls_cipher_cmac_reset(), and sc_mbedtls_cipher_cmac_finish().
- *                      Can be called repeatedly.
- *
- * \param ctx           The cipher context used for the CMAC operation.
- * \param input         The buffer holding the input data.
- * \param ilen          The length of the input data.
- *
- * \return             \c 0 on success.
- * \return             #MBEDTLS_ERR_MD_BAD_INPUT_DATA
- *                     if parameter verification fails.
- */
-int sc_mbedtls_cipher_cmac_update( mbedtls_cipher_context_t *ctx,
-                                const unsigned char *input, size_t ilen );
-
-/**
- * \brief               This function finishes the CMAC operation, and writes
- *                      the result to the output buffer.
- *
- *                      It is called after sc_mbedtls_cipher_cmac_update().
- *                      It can be followed by sc_mbedtls_cipher_cmac_reset() and
- *                      sc_mbedtls_cipher_cmac_update(), or mbedtls_cipher_free().
- *
- * \param ctx           The cipher context used for the CMAC operation.
- * \param output        The output buffer for the CMAC checksum result.
- *
- * \return              \c 0 on success.
- * \return              #MBEDTLS_ERR_MD_BAD_INPUT_DATA
- *                      if parameter verification fails.
- */
-int sc_mbedtls_cipher_cmac_finish( mbedtls_cipher_context_t *ctx,
-                                unsigned char *output );
-
-/**
- * \brief               This function prepares the authentication of another
- *                      message with the same key as the previous CMAC
- *                      operation.
- *
- *                      It is called after sc_mbedtls_cipher_cmac_finish()
- *                      and before sc_mbedtls_cipher_cmac_update().
- *
- * \param ctx           The cipher context used for the CMAC operation.
- *
- * \return              \c 0 on success.
- * \return              #MBEDTLS_ERR_MD_BAD_INPUT_DATA
- *                      if parameter verification fails.
- */
-int sc_mbedtls_cipher_cmac_reset( mbedtls_cipher_context_t *ctx );
-
-/**
- * \brief               This function calculates the full generic CMAC
- *                      on the input buffer with the provided key.
- *
- *                      The function allocates the context, performs the
- *                      calculation, and frees the context.
- *
- *                      The CMAC result is calculated as
- *                      output = generic CMAC(cmac key, input buffer).
- *
- * \note                When the CMAC implementation is supplied by an alternate
- *                      implementation (through #MBEDTLS_CMAC_ALT), some ciphers
- *                      may not be supported by that implementation, and thus
- *                      return an error. Alternate implementations must support
- *                      AES-128 and AES-256, and may support AES-192 and 3DES.
- *
- * \param cipher_info   The cipher information.
- * \param key           The CMAC key.
- * \param keylen        The length of the CMAC key in bits.
- * \param input         The buffer holding the input data.
- * \param ilen          The length of the input data.
- * \param output        The buffer for the generic CMAC result.
- *
- * \return              \c 0 on success.
- * \return              #MBEDTLS_ERR_MD_BAD_INPUT_DATA
- *                      if parameter verification fails.
- */
-int sc_mbedtls_cipher_cmac( const mbedtls_cipher_info_t *cipher_info,
-                         const unsigned char *key, size_t keylen,
-                         const unsigned char *input, size_t ilen,
-                         unsigned char *output );
-
-#if defined(MBEDTLS_AES_C)
-/**
- * \brief           This function implements the AES-CMAC-PRF-128 pseudorandom
- *                  function, as defined in
- *                  <em>RFC-4615: The Advanced Encryption Standard-Cipher-based
- *                  Message Authentication Code-Pseudo-Random Function-128
- *                  (AES-CMAC-PRF-128) Algorithm for the Internet Key
- *                  Exchange Protocol (IKE).</em>
- *
- * \param key       The key to use.
- * \param key_len   The key length in Bytes.
- * \param input     The buffer holding the input data.
- * \param in_len    The length of the input data in Bytes.
- * \param output    The buffer holding the generated 16 Bytes of
- *                  pseudorandom output.
- *
- * \return          \c 0 on success.
- */
-int sc_mbedtls_aes_cmac_prf_128( const unsigned char *key, size_t key_len,
-                              const unsigned char *input, size_t in_len,
-                              unsigned char output[16] );
-#endif /* MBEDTLS_AES_C */
-
-#if defined(MBEDTLS_SELF_TEST) && ( defined(MBEDTLS_AES_C) || defined(MBEDTLS_DES_C) )
-/**
- * \brief          The CMAC checkup routine.
- *
- * \note           In case the CMAC routines are provided by an alternative
- *                 implementation (i.e. #MBEDTLS_CMAC_ALT is defined), the
- *                 checkup routine will succeed even if the implementation does
- *                 not support the less widely used AES-192 or 3DES primitives.
- *                 The self-test requires at least AES-128 and AES-256 to be
- *                 supported by the underlying implementation.
- *
- * \return         \c 0 on success.
- * \return         \c 1 on failure.
- */
-int sc_mbedtls_cmac_self_test( int verbose );
-#endif /* MBEDTLS_SELF_TEST && ( MBEDTLS_AES_C || MBEDTLS_DES_C ) */
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* MBEDTLS_CMAC_H */
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Han Gao	f0f8c468fa	configs: fix load dtb name Signed-off-by: Han Gao <gaohan@iscas.ac.cn>	2024-06-02 12:03:22 +08:00
Han Gao	41e7dd7aa0	huiwei: remove ili9881c_panel Signed-off-by: Han Gao <gaohan@iscas.ac.cn>	2024-06-01 21:51:30 +08:00
Han Gao	80e817fa5d	ci: add huiwei build Signed-off-by: Han Gao <gaohan@iscas.ac.cn>	2024-06-01 21:47:46 +08:00
lin_jiayong	3783e6df07	sync: huiwei: charge: add support for pd charging commit: 475700a11696fe2dc45c01cdfbf5f3cc470e3a60	2024-06-01 21:42:52 +08:00
Bingpeng_Lao	7c6352a020	sync: huiwei 5da0e0ce26e0093b2a169c96b4fc481b8bf31efb merge into affb3e123b5db5711db87c8819b0306156402e79	2024-06-01 21:37:47 +08:00
lin_jiayong	1aec90053d	sync: huiwei e92da50a54f00ae044eec58de8ae56cde5bb61dd merge into 03a9fc66d7ddb7fd4ae80ad121ef1e5abd49aabd	2024-06-01 21:31:53 +08:00
lin_jiayong	02f2afad91	sync: huiwei c2ecb41045e43cdb174697151cd6da0f9b89d58c merge into 6f7882b1eb9aaa2dc5271f5a9341ea6937f5e253	2024-06-01 21:27:42 +08:00
Han Gao	a82bec3193	configs: add light_huiwei_defconfig Signed-off-by: Han Gao <gaohan@iscas.ac.cn>	2024-06-01 21:20:32 +08:00
Han Gao	baebb7e5ad	dts: huiwei: add base dts Signed-off-by: Han Gao <gaohan@iscas.ac.cn>	2024-06-01 21:18:10 +08:00
Han Gao	96627087db	meles: add aon config Signed-off-by: Han Gao <gaohan@iscas.ac.cn>	2024-05-29 16:21:44 +08:00
Han Gao	da9c7240ac	Revert "fastboot: clean hibernate image when update uboot/kernel/rootfs partition" This reverts commit `3a7b5088ee`.	2024-05-29 16:21:44 +08:00
Han Gao	e6d25986dd	ci: update toolchains Signed-off-by: Han Gao <gaohan@iscas.ac.cn>	2024-05-29 16:21:44 +08:00
xianbing Zhu	d2c6528890	fastboot: clean hibernate image when update uboot/kernel/rootfs partition When update version,this commit erase normal hibernate image and fastresume image.Before this,only fastresume image is erased. This may caused issue when hibernate image saved before update version. Update one of uboot/kernel/rootfs will clean hibernate image. Signed-off-by: xianbing Zhu <xianbing.zhu@linux.alibaba.com> Change-Id: I92cd9ccda83f8d1e215e0f8d75e7cf34380a6201	2024-05-29 16:21:44 +08:00
钦峰	cefbf1d0ea	1:fix compile warning 2:add aon set magic Change-Id: I511dc51ff71ae9567dcc0b6b91f6bcac1ae61f3b	2024-05-29 16:21:44 +08:00
Han Gao	c7e455caf5	th1520: SPL_TEXT_BASE=0xffe0000000 for nosign spl Signed-off-by: Han Gao <gaohan@iscas.ac.cn>	2024-05-29 16:21:44 +08:00
Han Gao	905fa2e762	sync config Signed-off-by: Han Gao <gaohan@iscas.ac.cn>	2024-05-29 16:21:44 +08:00
thead_admin	2674ac70e4	Linux_SDK_V1.5.4 Signed-off-by: thead_admin <occ_thead@service.alibaba.com>	2024-05-29 16:21:44 +08:00
Han Gao	e0247b8a62	fix: run gpt_partition failed Signed-off-by: Han Gao <gaohan@iscas.ac.cn>	2024-03-28 11:00:40 +00:00
Haaland Chen	2fc52cbb27	include: light-c910.h: add fdtoverlay_addr_r Signed-off-by: Haaland Chen <haaland@milkv.io>	2024-03-27 04:06:40 -05:00
Han Gao	ce1890d0dc	fix: remove find partuuid Signed-off-by: Han Gao <gaohan@iscas.ac.cn>	2024-03-24 06:57:04 -05:00
Han Gao	9893f1a2c0	feat: add sdcard boot first Signed-off-by: Han Gao <gaohan@iscas.ac.cn>	2024-03-24 06:57:04 -05:00
Haaland Chen	f80c918aa2	configs: meles: use new fdt default name Since T-HEAD Linux SDK V1.4.2, modified the kernel device tree naming rules, starting with th1520. Signed-off-by: Haaland Chen <haaland@milkv.io>	2024-03-21 04:16:26 -05:00
Han Gao	69d7d3cda0	feat: add format swap partition for resume Signed-off-by: Han Gao <gaohan@iscas.ac.cn>	2024-01-31 20:52:36 +08:00
Han Gao	4529d8d50f	Revert "fix(c9xx): don't flush dcache when invalidating" This reverts commit `adec30ace4`.	2024-01-31 16:19:17 +08:00
Han Gao	74eca2553e	feat: enable load str firmware Signed-off-by: Han Gao <gaohan@iscas.ac.cn>	2024-01-31 16:19:17 +08:00
Han Gao	f14addebf4	Add tag publish firmware Signed-off-by: Han Gao <gaohan@iscas.ac.cn>	2024-01-27 11:11:02 +00:00
Han Gao	9d7cb33654	fix error to written eth1addr Signed-off-by: Han Gao <gaohan@iscas.ac.cn>	2024-01-24 00:15:25 +08:00
Han Gao	5dd8bce935	ci: add lc4a mainline dt name support Signed-off-by: Han Gao <gaohan@iscas.ac.cn>	2024-01-24 00:00:18 +08:00
Han Gao	de8dcffdd9	ci: add mainline dt name support Signed-off-by: Han Gao <gaohan@iscas.ac.cn>	2024-01-24 00:00:18 +08:00
Han Gao	0060af48c1	workaround: add delay Signed-off-by: Han Gao <gaohan@iscas.ac.cn>	2024-01-22 15:55:16 +08:00
Han Gao	6935c50d54	config: enable BOARD_RNG_SEED Signed-off-by: Han Gao <gaohan@iscas.ac.cn>	2024-01-22 15:55:16 +08:00
Han Gao	5bd86ffd9d	config: update ROW16 to DDP Signed-off-by: Han Gao <gaohan@iscas.ac.cn>	2024-01-22 15:55:16 +08:00
thead_admin	abe41ba65e	Linux_SDK_V1.4.2 Signed-off-by: thead_admin <occ_thead@service.alibaba.com>	2024-01-22 15:55:16 +08:00
thead_admin	3e564f9f0c	Linux_SDK_V1.3.3 Signed-off-by: thead_admin <occ_thead@service.alibaba.com>	2024-01-22 15:55:16 +08:00
Han Gao	34dd739d4c	ci: add build for lcon4a & lc4a Signed-off-by: Han Gao <gaohan@iscas.ac.cn>	2023-12-26 17:08:20 +08:00
Lu Hui	1f45edb0fc	defconfig: add light_lpi4a_[cluster\|console]_defconfig	2023-12-26 17:08:20 +08:00
Lu Hui	f79d320ffa	drivers: video: ilitek-ili9881c.c: add long delay panel reset	2023-12-26 17:08:20 +08:00
Lu Hui	e66283f0d5	arch: dts: light-lpi4a: allow pane0 ref by other dts	2023-12-26 17:08:20 +08:00
Lu Hui	d43b44b9a0	drivers: panel: add panel-mingjun-070bi30ia2	2023-12-26 17:08:20 +08:00
Han Gao	a455494040	ci: update toolchains Signed-off-by: Han Gao <gaohan@iscas.ac.cn>	2023-12-15 23:35:53 +08:00
Gilbert Gilb's	adec30ace4	fix(c9xx): don't flush dcache when invalidating The data cache invalidation function for c9xx CPUs uses `dcache.cipa` instruction. According to T-Head extension specification[1] section 3.1.5, this instruction also performs a cache clean along with the invalidation. On top of being incorrect, this leads to a serious issue on the designware ethernet driver, where stalled cache may get flushed each time we handle a new received packet[2]. As a result, received packet are randomly corrupted with old cached data. This can easily be reproduced by sending an ARP request to the device during a TFTP transfer. The last TFTP block is treated as the ARP reply we just sent, which makes U-Boot hang on the block. Always use `dcache.ipa` instruction to invalidate dcache. Replace existing usages of `dcache.ipa` with our implementation. Note that this fix is slightly intrusive as it changes the cache invalidation behavior in all drivers. However, I have not noticed any side-effect during my tests. [1] https://github.com/T-head-Semi/thead-extension-spec/releases/download/2.3.0/xthead-2023-11-10-2.3.0.pdf [2] `918a8c89e0/drivers/net/designware.c (L475)`	2023-12-15 23:35:31 +08:00
Haaland Chen	7632089652	board: light-c910: update milkv meles iopin initialization status Signed-off-by: Haaland Chen <haaland@milkv.io>	2023-12-13 14:04:27 +08:00
Han Gao	e76acfd716	ci: enable ci for meles 4g/8g Signed-off-by: Han Gao <gaohan@iscas.ac.cn>	2023-12-03 11:32:41 +08:00
Han Gao	0e64ba274e	fix: set fdt_default_name for meles 4g/8g Signed-off-by: Han Gao <gaohan@iscas.ac.cn>	2023-12-03 11:32:41 +08:00
Haaland Chen	119bb8eaed	configs: add milkv-meles singlerank ddr and dualrank ddr defconfig Signed-off-by: Haaland Chen <haaland@milkv.io>	2023-12-03 11:32:41 +08:00
Haaland Chen	078bfd152e	riscv: dts: milkv-meles: turn on blue user led Signed-off-by: Haaland Chen <haaland@milkv.io>	2023-12-03 11:32:41 +08:00
Haaland Chen	b604779862	light-c910: set CONFIG_MISC_INIT_R Signed-off-by: Haaland Chen <haaland@milkv.io>	2023-12-03 11:32:41 +08:00
Haaland Chen	253adbc8e9	board: light-c910: add function light_c910_set_gpio_output_high Signed-off-by: Haaland Chen <haaland@milkv.io>	2023-12-03 11:32:41 +08:00
Haaland Chen	985e884b0b	add Milk-V Meles board Signed-off-by: Haaland Chen <haaland@milkv.io>	2023-12-03 11:32:41 +08:00
Han Gao	918a8c89e0	configs: fix default dtb file name Signed-off-by: Han Gao <gaohan@iscas.ac.cn>	2023-10-26 02:52:22 +08:00
Han Gao	79454e91bc	chore: enable ci for beagle-ahead Signed-off-by: Han Gao <gaohan@iscas.ac.cn>	2023-10-20 13:38:37 +08:00
Han Gao	491776f3c1	chore: sync lpi4a config Signed-off-by: Han Gao <gaohan@iscas.ac.cn>	2023-10-20 13:38:37 +08:00
Deepak Khatri	24498fc55d	Update cape header GPIO pinmuxing	2023-10-20 13:38:37 +08:00
Baozhu Zuo	146c2c2031	Modify GPIO default status for Beagle Bluetooth uart4 module	2023-10-20 13:38:37 +08:00
Deepak Khatri	bb72cf3a29	Fix SD boot button issue	2023-10-20 13:38:37 +08:00
Deepak Khatri	b24d63765c	Update default mikroBus pinmuxing	2023-10-20 13:38:37 +08:00
Deepak Khatri	c7f2155100	Update debug port pinmux To check if low drive strength is causing problem.	2023-10-20 13:38:37 +08:00
Deepak Khatri	3e7fb26cb0	Pinmux update: PullDown pins	2023-10-20 13:38:37 +08:00
Deepak Khatri	ce871ac516	Update BeagleV Ahead pinmuxing	2023-10-20 13:38:37 +08:00
Robert Nelson	798af1f1c5	backport of: [PATCH] cmd: pxe: add support for FDT overlays Signed-off-by: Robert Nelson <robertcnelson@gmail.com>	2023-10-20 13:38:37 +08:00
Kory Maincent	cccf006cae	pytest: add sandbox test for "extension" command This commit extends the sandbox to implement a dummy extension_board_scan() function and enables the extension command in the sandbox configuration. It then adds a test that checks the proper functionality of the extension command by applying two Device Tree overlays to the sandbox Device Tree. Signed-off-by: Kory Maincent <kory.maincent@bootlin.com> [trini: Limit to running on sandbox] Signed-off-by: Tom Rini <trini@konsulko.com>	2023-10-20 13:38:37 +08:00
Kory Maincent	c86cc5402a	cmd: add support for a new "extension" command This patch adds a new "extension" command, which aims at detecting extension boards connected to the hardware platform, and apply the Device Tree overlays that describe the hardware present on those extension boards. In order to enable this mechanism, board-specific code must implement the extension_board_scan() function that fills in a linked list of "struct extension", each describing one extension board. In addition, the board-specific code must select the SUPPORT_EXTENSION_SCAN Kconfig boolean. Based on this: - "extension scan" makes the generic code call the board-specific extension_board_scan() function to retrieve the list of detected extension boards. - "extension list" allows to list the detected extension boards. - "extension apply <number>\|all" allows to apply the Device Tree overlay(s) corresponding to one, or all, extension boards The latter requires two environment variables to exist and set one variable to run: - extension_overlay_addr: the RAM address where to load the Device Tree overlays - extension_overlay_cmd: the U-Boot command to load one overlay. Indeed, the location and mechanism to load DT overlays is very setup specific. - extension_overlay_name: set by the command: the name of the DT which will be load during the execution. When calling the command described in the extension_overlay_cmd variable, the variable extension_overlay_name will be defined. So a typical extension_overlay_cmd will look like this: extension_overlay_cmd=load mmc 0:1 $extension_overlay_addr /boot/$extension_overlay_name Here is an example on how to use it: => run loadfdt => fdt addr $fdtaddr => setenv extension_overlay_addr 0x1000 => setenv extension_overlay_cmd 'load mmc 0:1 ${extension_overlay_addr} /boot/${extension_overlay_name}' => extension scan Found 1 extension board(s). => extension apply 0 519 bytes read in 3 ms (168.9 KiB/s) Signed-off-by: Kory Maincent <kory.maincent@bootlin.com> Reviewed-by: Maxime Ripard <maxime@cerno.tech>	2023-10-20 13:38:37 +08:00
Kory Maincent	5468ecbaf0	fdt_support: move fdt_valid from cmd_fdt.c to fdt_support.c Move the fdt_valid function to fdt_support. This changes allow to be able to test the validity of a devicetree in other c files. Update code syntax. Signed-off-by: Kory Maincent <kory.maincent@bootlin.com> Reviewed-by: Tom Rini <trini@konsulko.com> Reviewed-by: Maxime Ripard <maxime@cerno.tech>	2023-10-20 13:38:37 +08:00
Robert Nelson	4f8a362580	light_beagle_defconfig: enable CONFIG_OF_LIBFDT_OVERLAY=y Signed-off-by: Robert Nelson <robertcnelson@gmail.com>	2023-10-20 13:38:37 +08:00
Robert Nelson	e6972d40e0	Modify_GPIO_default_status_for_Beagle_WIFI_BLE_module Signed-off-by: Robert Nelson <robertcnelson@gmail.com>	2023-10-20 13:38:37 +08:00
Robert Nelson	44d2f2e746	light_beagle_defconfig: run savedefconfig Signed-off-by: Robert Nelson <robertcnelson@gmail.com>	2023-10-20 13:38:37 +08:00
Han Gao	620420ad19	fix: ensure flashing img not to lose mac address Signed-off-by: Han Gao <gaohan@iscas.ac.cn>	2023-10-19 01:55:10 +08:00
Sean Anderson	a9ee746687	fastboot: Fix overflow when calculating chunk size If a chunk was larger than 4GiB, then chunk_data_sz would overflow and blkcnt would not be calculated correctly. Upgrade it to a u64 and cast its multiplicands as well. Also fix bytes_written while we're at it. Signed-off-by: Sean Anderson <sean.anderson@seco.com> Reviewed-by: Heiko Schocher <hs@denx.de>	2023-10-19 00:15:40 +08:00
Lu Hui	8640db84b8	include: configs: light-c910.h: allow boot partition use other filesystem type	2023-09-03 01:40:15 +08:00
thead_admin	329e2581fe	Linux_SDK_V1.2.1 Signed-off-by: thead_admin <occ_thead@service.alibaba.com>	2023-08-19 02:17:24 +08:00
Nekorouter	8337ee75f4	Update dtb name: add vendor name path to CONFIG_DEFAULT_FDT_FILE	2023-08-08 14:26:28 +08:00
Han Gao	a1d4fb05b7	chore: add ums gadget for light-val-a Signed-off-by: Han Gao <gaohan@iscas.ac.cn>	2023-08-02 02:58:25 +08:00
Han Gao	5de93f1630	chore: add 16g ci & modify SYS_PROMPT Signed-off-by: Han Gao <gaohan@iscas.ac.cn>	2023-08-02 02:58:25 +08:00
Icenowy Zheng	54c4a8493c	add default fdt filenames Signed-off-by: Icenowy Zheng <uwu@icenowy.me> Co-Authored-By: Han Gao <gaohan@iscas.ac.cn> Signed-off-by: Han Gao <gaohan@iscas.ac.cn>	2023-08-02 02:58:25 +08:00
Icenowy Zheng	5742f1a0d7	fix 16g dram print Signed-off-by: Icenowy Zheng <uwu@icenowy.me>	2023-08-02 02:58:25 +08:00
Icenowy Zheng	1957dccb60	add config for 16G board Signed-off-by: Icenowy Zheng <uwu@icenowy.me>	2023-08-02 02:58:25 +08:00
Icenowy Zheng	32c42cd31c	add row16 option Signed-off-by: Icenowy Zheng <uwu@icenowy.me>	2023-08-02 02:58:25 +08:00
Han Gao	6fb1286862	fix: disable custom logo Signed-off-by: Han Gao <gaohan@iscas.ac.cn>	2023-07-30 04:05:47 +08:00
Han Gao	ea605b77cf	feat: update SDK1.2.0 Signed-off-by: Han Gao <gaohan@iscas.ac.cn>	2023-07-30 03:57:28 +08:00
Spacefish	abc7bb33e3	Typo in spl.c Small typo in comment	2023-07-25 10:05:19 +08:00
Alexandre Ghiti	5316611f0d	riscv: Fix build against binutils 2.38 The following description is copied from the equivalent patch for the Linux Kernel proposed by Aurelien Jarno: >From version 2.38, binutils default to ISA spec version 20191213. This means that the csr read/write (csrr/csrw) instructions and fence.i instruction has separated from the `I` extension, become two standalone extensions: Zicsr and Zifencei. As the kernel uses those instruction, this causes the following build failure: arch/riscv/cpu/mtrap.S: Assembler messages: arch/riscv/cpu/mtrap.S:65: Error: unrecognized opcode `csrr a0,scause' arch/riscv/cpu/mtrap.S:66: Error: unrecognized opcode `csrr a1,sepc' arch/riscv/cpu/mtrap.S:67: Error: unrecognized opcode `csrr a2,stval' arch/riscv/cpu/mtrap.S:70: Error: unrecognized opcode `csrw sepc,a0' Signed-off-by: Alexandre Ghiti <alexandre.ghiti@canonical.com> Reviewed-by: Bin Meng <bmeng.cn@gmail.com> Tested-by: Heinrich Schuchardt <heinrich.schuchardt@canonical.com> Tested-by: Heiko Stuebner <heiko@sntech.de> Tested-by: Christian Stewart <christian@paral.in> Reviewed-by: Rick Chen <rick@andestech.com>	2023-07-24 06:14:09 +08:00
Han Gao	a75631c2e3	fix: unknown CSR 'mhcr' (arch/riscv/cpu/c9xx/cpu.c) Signed-off-by: Han Gao <gaohan@iscas.ac.cn>	2023-07-24 06:14:09 +08:00
Han Gao	5532ffee67	feat: add gcc-12 build Signed-off-by: Han Gao <gaohan@iscas.ac.cn>	2023-07-24 06:14:09 +08:00
Han Gao	94a1ac2308	fix: save mac address Signed-off-by: Han Gao <gaohan@iscas.ac.cn>	2023-07-14 20:30:10 +08:00
Han Gao	0cc8176254	feat: update slogan Signed-off-by: Han Gao <gaohan@iscas.ac.cn>	2023-07-13 01:33:27 +08:00
Han Gao	b69e053b49	feat: add extlinux boot Signed-off-by: Han Gao <gaohan@iscas.ac.cn>	2023-07-12 21:57:40 +08:00
Han Gao	3e234eecd6	feat: add ruyisdk logo Signed-off-by: Han Gao <gaohan@iscas.ac.cn>	2023-07-12 03:54:52 +08:00
Han Gao	f81b413992	fix: repair check mac vaild timing Signed-off-by: Han Gao <gaohan@iscas.ac.cn>	2023-07-12 02:52:40 +08:00
chainsx	d43b782d70	fix: fix and add ums gadget(usb mass storage gadget)	2023-07-07 11:55:19 +08:00
wu-yue-yu	d6c9182f62	fix: fix the problem of wrong overwritten mac address	2023-06-28 01:15:58 +08:00
ztd	b5768043c2	fix: set fixed mac addrs (#1 ) * fix: set fixed mac addr	2023-05-15 19:19:21 +08:00
Han Gao	57dbac41bd	feat: add ci build Signed-off-by: Han Gao <gaohan@iscas.ac.cn>	2023-05-10 02:36:47 +08:00
Han Gao	403553d697	fix: ftbfs Signed-off-by: Han Gao <gaohan@iscas.ac.cn>	2023-05-10 02:25:53 +08:00
Han Gao	0fd098d190	fix: fix bootargs Signed-off-by: Han Gao <gaohan@iscas.ac.cn>	2023-05-10 02:23:55 +08:00
t61230	09e2c3f93f	ENV_SETTINGS	2023-04-06 13:34:05 +08:00