diff --git a/board/businesscard/v1/dts/businesscard.dts b/board/businesscard/v1/dts/businesscard.dts index c04e5bc..a1749a9 100644 --- a/board/businesscard/v1/dts/businesscard.dts +++ b/board/businesscard/v1/dts/businesscard.dts @@ -47,13 +47,13 @@ partition@0 { label = "u-boot"; - reg = <0x000000 0x80000>; + reg = <0x000000 0x40000>; //read-only; }; partition@110000 { label = "rootubi"; - reg = <0x80000 0x780000>; + reg = <0x40000 0x7C0000>; //read-only; }; }; diff --git a/board/businesscard/v1/flash.layout b/board/businesscard/v1/flash.layout index 56647d0..6d9d0d8 100644 --- a/board/businesscard/v1/flash.layout +++ b/board/businesscard/v1/flash.layout @@ -1,2 +1,2 @@ -00000000:0007ffff uboot -00080000:007fffff rootubi +00000000:0003ffff uboot +00040000:007fffff rootubi diff --git a/board/businesscard/v1/genimage.cfg b/board/businesscard/v1/genimage.cfg index 178a4fb..c55c467 100644 --- a/board/businesscard/v1/genimage.cfg +++ b/board/businesscard/v1/genimage.cfg @@ -12,7 +12,7 @@ image flash.bin { flashtype = w25q64 partition uboot { image = "u-boot-sunxi-with-spl.bin" - size = 512K + size = 256K } partition rootubi { image = root.ubi @@ -44,7 +44,7 @@ image flashdrive.img { image persist.ubifs { ubifs { - extraargs = "--compr=zlib --jrn-size=64KiB --log-lebs=2" + extraargs = "--compr=zlib --jrn-size=192KiB --log-lebs=2" } size=1280K flashtype = w25q64 diff --git a/board/businesscard/v1/uboot_defconfig b/board/businesscard/v1/uboot_defconfig index 7996ffb..f6ea357 100644 --- a/board/businesscard/v1/uboot_defconfig +++ b/board/businesscard/v1/uboot_defconfig @@ -8,36 +8,42 @@ CONFIG_DRAM_CLK=156 CONFIG_DRAM_ZQ=0 # CONFIG_VIDEO_SUNXI is not set CONFIG_SPL_SPI_SUNXI=y +# CONFIG_DISTRO_DEFAULTS is not set +CONFIG_ENV_VARS_UBOOT_CONFIG=y # CONFIG_FIT is not set CONFIG_BOOTDELAY=0 +CONFIG_USE_BOOTCOMMAND=y CONFIG_BOOTCOMMAND="setenv bootargs console=ttyS0,115200 ubi.mtd=1 ubi.block=0,root ubi.block=0,flashdrive root=/dev/ubiblock0_2 g_acm_ms.removable=1; sf probe 0 20000000; ubi part rootubi; ubi read ${kernel_addr_r} kernel; ubi read ${fdt_addr_r} dtb; bootz ${kernel_addr_r} - ${fdt_addr_r}" CONFIG_LOG_MAX_LEVEL=6 CONFIG_LOG_ERROR_RETURN=y +CONFIG_SUPPORT_RAW_INITRD=y # CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_USE_SECTOR is not set CONFIG_SPL_MTD_SUPPORT=y # CONFIG_SPL_POWER_SUPPORT is not set CONFIG_SPL_RAM_SUPPORT=y CONFIG_SPL_RAM_DEVICE=y +# CONFIG_SYS_LONGHELP is not set +# CONFIG_CMD_BDI is not set +# CONFIG_CMD_CONSOLE is not set +CONFIG_CMD_BOOTZ=y +# CONFIG_CMD_ELF is not set +# CONFIG_CMD_CRC32 is not set # CONFIG_CMD_FLASH is not set # CONFIG_CMD_GPT is not set # CONFIG_CMD_LOADB is not set # CONFIG_CMD_PINMUX is not set CONFIG_CMD_SF=y -CONFIG_CMD_USB_SDP=y -CONFIG_CMD_USB_MASS_STORAGE=y +CONFIG_CMD_MTDPARTS=y CONFIG_MTDIDS_DEFAULT="nor0=spi-flash" -CONFIG_MTDPARTS_DEFAULT="mtdparts=spi-flash:512k(uboot),-(rootubi)" +CONFIG_MTDPARTS_DEFAULT="mtdparts=spi-flash:256k(uboot),-(rootubi)" CONFIG_CMD_LOG=y CONFIG_CMD_UBI=y # CONFIG_CMD_UBIFS is not set -# CONFIG_SPL_DOS_PARTITION is not set -# CONFIG_ISO_PARTITION is not set -# CONFIG_SPL_EFI_PARTITION is not set +# CONFIG_PARTITIONS is not set CONFIG_DEFAULT_DEVICE_TREE="businesscard" -# CONFIG_ENV_IS_IN_FAT is not set # CONFIG_NET is not set -# CONFIG_USB_FUNCTION_FASTBOOT is not set -# CONFIG_MMC_HW_PARTITIONING is not set +CONFIG_HAVE_BLOCK_DEVICE=y +# CONFIG_MMC is not set CONFIG_MTD=y CONFIG_DM_SPI_FLASH=y CONFIG_SPI_FLASH=y @@ -49,14 +55,11 @@ CONFIG_SPI_FLASH_MACRONIX=y CONFIG_SPI_FLASH_WINBOND=y # CONFIG_SPI_FLASH_USE_4K_SECTORS is not set CONFIG_SPI_FLASH_MTD=y -CONFIG_PHY_SUN4I_USB=y CONFIG_PINCTRL=y CONFIG_SPI=y CONFIG_DM_SPI=y CONFIG_SPI_SUNXI=y -CONFIG_USB_MUSB_GADGET=y -CONFIG_USB_GADGET_DOWNLOAD=y CONFIG_SYS_WHITE_ON_BLACK=y -CONFIG_SHA1=y -CONFIG_SHA256=y -CONFIG_EFI_LOADER_HII=y +CONFIG_HEXDUMP=y +# CONFIG_OF_LIBFDT_OVERLAY is not set +# CONFIG_EFI_LOADER is not set