From 9063a45d5a29c7e8f4050e9e9877506920e7764a Mon Sep 17 00:00:00 2001 From: Laowang-BearPi Date: Thu, 31 Mar 2022 22:12:44 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=83=A8=E5=88=86=E6=9D=BF?= =?UTF-8?q?=E7=BA=A7=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Laowang-BearPi --- drivers/char/random/Kconfig | 2 +- fs/rootfs/Kconfig | 3 +-- fs/rootfs/los_rootfs.h | 12 ------------ platform/Kconfig | 9 +++------ 4 files changed, 5 insertions(+), 21 deletions(-) diff --git a/drivers/char/random/Kconfig b/drivers/char/random/Kconfig index c8b800dd..5b75e0e5 100644 --- a/drivers/char/random/Kconfig +++ b/drivers/char/random/Kconfig @@ -5,7 +5,7 @@ config DRIVERS_RANDOM help Answer Y to support random. config HW_RANDOM_ENABLE - depends on DRIVERS_RANDOM && (PLATFORM_HI3518EV300 || PLATFORM_HI3516CV300 || PLATFORM_HI3516DV300 || PLATFORM_HI3556V200 || PLATFORM_QEMU_ARM_VIRT_CA7 || PLATFORM_STM32MP157) + depends on DRIVERS_RANDOM && (PLATFORM_HI3518EV300 || PLATFORM_HI3516CV300 || PLATFORM_HI3516DV300 || PLATFORM_HI3556V200 || PLATFORM_QEMU_ARM_VIRT_CA7) bool "Select hw random" default y help diff --git a/fs/rootfs/Kconfig b/fs/rootfs/Kconfig index d53ae2db..d1c39d24 100644 --- a/fs/rootfs/Kconfig +++ b/fs/rootfs/Kconfig @@ -29,10 +29,9 @@ endchoice config BOOTENV_ADDR int "Address of boot command line (KB)" depends on PLATFORM_ROOTFS && (STORAGE_SPINOR || STORAGE_SPINAND || STORAGE_EMMC) - range 0 3072 default 512 help - Boot command line addr, range from 0 to 3MB. + Boot command line addr. config BOOTENV_RAM bool "Read bootenv from RAM" diff --git a/fs/rootfs/los_rootfs.h b/fs/rootfs/los_rootfs.h index 12a3e4d1..f56ee340 100644 --- a/fs/rootfs/los_rootfs.h +++ b/fs/rootfs/los_rootfs.h @@ -66,17 +66,6 @@ #define ROOTFS_SIZE 0x1B00000 #define USERFS_SIZE (CFIFLASH_CAPACITY - ROOTFS_ADDR - ROOTFS_SIZE) #elif defined (LOSCFG_STORAGE_EMMC) -#if defined(LOSCFG_PLATFORM_STM32MP157) -#define ROOT_DEV_NAME "/dev/mmcblk1p0" -#ifdef LOSCFG_PLATFORM_PATCHFS -#define PATCH_DEV_NAME "/dev/mmcblk0p1" -#define USER_DEV_NAME "/dev/mmcblk0p2" -#define USERDATA_DEV_NAME "/dev/mmcblk0p3" -#else -#define USER_DEV_NAME "/dev/mmcblk1p1" -#define USERDATA_DEV_NAME "/dev/mmcblk1p2" -#endif -#else #define ROOT_DEV_NAME "/dev/mmcblk0p0" #ifdef LOSCFG_PLATFORM_PATCHFS #define PATCH_DEV_NAME "/dev/mmcblk0p1" @@ -86,7 +75,6 @@ #define USER_DEV_NAME "/dev/mmcblk0p1" #define USERDATA_DEV_NAME "/dev/mmcblk0p2" #endif -#endif #define ROOTFS_ADDR 0xA00000 #define ROOTFS_SIZE 0x1400000 #define USERFS_SIZE 0x3200000 diff --git a/platform/Kconfig b/platform/Kconfig index 4cb1b186..57f14f37 100644 --- a/platform/Kconfig +++ b/platform/Kconfig @@ -3,7 +3,6 @@ config PLATFORM default "hi3516dv300" if PLATFORM_HI3516DV300 default "hi3518ev300" if PLATFORM_HI3518EV300 default "virt" if PLATFORM_QEMU_ARM_VIRT_CA7 - default "stm32mp157" if PLATFORM_STM32MP157 config PRODUCT_NAME string "product name" @@ -12,14 +11,12 @@ config PRODUCT_NAME default "hispark_taurus" if PRODUCT_HISPARK_TAURUS default "hispark_aries" if PRODUCT_HISPARK_ARIES default "arm_virt" if PRODUCT_QEMU_ARM - default "stm32mp157_liteos" if PRODUCT_STM32MP157_LITEOS config DEVICE_COMPANY string "vendor name" default "hisilicon" if PLATFORM_HI3516DV300 default "hisilicon" if PLATFORM_HI3518EV300 default "qemu" if PLATFORM_QEMU_ARM_VIRT_CA7 - default "st" if PLATFORM_STM32MP157 choice prompt "Chip" @@ -68,8 +65,8 @@ config PRODUCT_HISPARK_ARIES config PRODUCT_QEMU_ARM bool "arm_virt" if PLATFORM_QEMU_ARM_VIRT_CA7 -config PRODUCT_STM32MP157_LITEOS - bool "stm32mp157_liteos" if PLATFORM_STM32MP157 +config LOSCFG_PRODUCT_BEARPI_HM_MICRO + bool "bearpi_hm_micro" if PLATFORM_STM32MP157 endchoice config BOARD_CONFIG_PATH @@ -79,7 +76,7 @@ config BOARD_CONFIG_PATH config TEE_ENABLE bool "Enable TEE" default n - depends on PLATFORM_HI3516DV300 || PLATFORM_STM32MP157 + depends on PLATFORM_HI3516DV300 help Enable teeos in platform -- GitLab