From 0d263e1071ee3f63d2047a8bb9af4434f1cd4bb1 Mon Sep 17 00:00:00 2001 From: Icenowy Zheng Date: Thu, 16 Jun 2022 09:46:42 +0800 Subject: [PATCH 2/2] HACK for UBI env and add defconfig --- board/sunxi/board.c | 1 + configs/popstick_defconfig | 37 +++++++++++++++++++++++++++++++++++++ 2 files changed, 38 insertions(+) create mode 100644 configs/popstick_defconfig --- a/board/sunxi/board.c +++ b/board/sunxi/board.c @@ -135,6 +135,7 @@ void i2c_init_board(void) */ enum env_location env_get_location(enum env_operation op, int prio) { + return prio ? ENVL_UNKNOWN : ENVL_UBI; if (prio > 1) return ENVL_UNKNOWN; --- /dev/null +++ b/configs/popstick_defconfig @@ -0,0 +1,37 @@ +CONFIG_ARM=y +CONFIG_SKIP_LOWLEVEL_INIT_ONLY=y +CONFIG_SPL_SKIP_LOWLEVEL_INIT_ONLY=y +CONFIG_ARCH_SUNXI=y +CONFIG_ENV_SIZE=0x1f000 +CONFIG_DEFAULT_DEVICE_TREE="suniv-f1c200s-popstick" +CONFIG_SPL=y +CONFIG_MACH_SUNIV=y +CONFIG_DRAM_CLK=156 +CONFIG_DRAM_ZQ=0 +# CONFIG_VIDEO_SUNXI is not set +CONFIG_SPL_SPI_SUNXI=y +CONFIG_SPL_SPI_SUNXI_NAND=y +CONFIG_SPL_SPI_SUNXI_NAND_ASSUMED_PAGESIZE=0x800 +# CONFIG_ANDROID_BOOT_IMAGE is not set +CONFIG_SYS_SPI_U_BOOT_OFFS=0x20000 +CONFIG_CMD_MTD=y +# CONFIG_CMD_SF is not set +CONFIG_CMD_MTDPARTS=y +CONFIG_CMD_UBI=y +# CONFIG_ENV_IS_IN_FAT is not set +# CONFIG_ENV_IS_IN_SPI_FLASH is not set +CONFIG_ENV_IS_IN_UBI=y +CONFIG_ENV_UBI_PART="ubi" +CONFIG_ENV_UBI_VOLUME="env" +# CONFIG_NET is not set +CONFIG_MTD=y +CONFIG_DM_MTD=y +CONFIG_MTD_SPI_NAND=y +# CONFIG_SPI_FLASH is not set +CONFIG_SF_DEFAULT_SPEED=25000000 +# CONFIG_UBI_SILENCE_MSG is not set +CONFIG_PHY_SUN4I_USB=y +CONFIG_SPI=y +CONFIG_USB_MUSB_GADGET=y +CONFIG_USB_FUNCTION_SDP=y +# CONFIG_UBIFS_SILENCE_MSG is not set