liyepan/openloongarch-uboot-2022.04
1
0
Fork 0
mirror of https://gitee.com/open-loongarch/u-boot.git synced 2026-10-25 20:57:12 +08:00
Code Issues Packages Projects Releases Wiki Activity

update to 54b793d98b

Browse Source 
1.uboot: ver: setup uboot ver to uboot_env before first boot save env
2.dts: Fix GMAC1 pinctrl usb uart0 pins
3.Add MACRO LOONGSON_USB_LOW_PAD control usb-pad to 0x1
4.2k1000: dp: support transfer dtb to kernel
5.dtb: cancel erase dtb part when update uboot
This commit is contained in:
loongson
2024-12-17 18:06:28 +08:00
parent a8e33e1ce5
commit 1aa1c7a1e0
21 changed files with 422 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files
configs/loongson_2k1000_dp_defconfig
+2 -2
View File
@@ -38,7 +38,7 @@ CONFIG_AUTOBOOT_STOP_STR="c"
CONFIG_USE_BOOTARGS=y
CONFIG_BOOTARGS="console=ttyS0,115200 rootfstype=ext4 rw rootwait"
CONFIG_USE_BOOTCOMMAND=y
CONFIG_BOOTCOMMAND="setenv bootargs ${bootargs} root=/dev/mmcblk0p${syspart} mtdparts=${mtdparts} fbcon=rotate:${rotate} panel=${panel};ext4load scsi 0:${syspart} ${loadaddr} /boot/uImage;bootm"
CONFIG_BOOTCOMMAND="setenv bootargs ${bootargs} root=/dev/sda${syspart} mtdparts=${mtdparts} fbcon=rotate:${rotate} panel=${panel};sf probe;sf read ${fdt_addr} dtb;scsi reset;ext4load scsi 0:${syspart} ${loadaddr} /boot/uImage;bootm"
CONFIG_LOGLEVEL=7
CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE=y
# CONFIG_SYS_DEVICE_NULLDEV is not set
@@ -82,7 +82,7 @@ CONFIG_CMD_ISOFS=y
CONFIG_CMD_FS_GENERIC=y
CONFIG_CMD_MTDPARTS=y
CONFIG_MTDIDS_DEFAULT="nor0=spi0.0"
CONFIG_MTDPARTS_DEFAULT="spi0.0:924k(uboot),32k(uboot_env),4k(bdinfo),56k(dtb),8k(ddr_context)"
CONFIG_MTDPARTS_DEFAULT="spi0.0:924k(uboot),32k(uboot_env),4k(bdinfo),52k(dtb),4k(bdinfo_e),8k(ddr_context)"
CONFIG_ISO_PARTITION=y
# CONFIG_SPL_EFI_PARTITION is not set
CONFIG_OF_LIVE=y
configs/loongson_2p500_evb_defconfig → configs/loongson_2k300_gongkong_gbkpgk0_defconfig
+35 -33
View File
@@ -10,17 +10,25 @@ CONFIG_ENV_OFFSET=0xe7000
CONFIG_ENV_SECT_SIZE=0x1000
CONFIG_DM_GPIO=y
CONFIG_SPL_DM_SPI=y
CONFIG_DEFAULT_DEVICE_TREE="ls2p500_evb"
CONFIG_DEFAULT_DEVICE_TREE="ls2k300_gongkong_gbkpgk0"
CONFIG_SPL_TEXT_BASE=0x9000000090000000
CONFIG_SPL_SERIAL=y
CONFIG_SPL_STACK_R_ADDR=0x9000000002000000
CONFIG_SPL_SYS_MALLOC_F_LEN=0x8000
CONFIG_SPL_SIZE_LIMIT=0x40000
CONFIG_SPL_SIZE_LIMIT_PROVIDE_STACK=0x100
CONFIG_SPL=y
CONFIG_SPL_SPI_FLASH_SUPPORT=y
CONFIG_SPL_SPI=y
CONFIG_ARCH_LA_LOONGSON=y
CONFIG_SOC_LS2P500=y
CONFIG_SOC_LS2K300=y
CONFIG_CPU_1000MHZ=y
CONFIG_TARGET_LS2K300_MINI_DP=y
CONFIG_LOONGSON_RECOVER=y
CONFIG_LOONGSON_GENERAL_LOAD=y
CONFIG_LOONGSON_BOARD_MMC_FS=y
CONFIG_LOONGSON_MMC_HIGH_PERFORMANCE=y
CONFIG_LOONGSON_USB_LOW_PAD=y
CONFIG_SPL_PAYLOAD="u-boot.img"
CONFIG_PHYS_64BIT=y
CONFIG_SYS_LOAD_ADDR=0x9000000003000000
@@ -30,9 +38,10 @@ CONFIG_AUTOBOOT_KEYED=y
CONFIG_AUTOBOOT_DELAY_STR="m"
CONFIG_AUTOBOOT_STOP_STR="c"
CONFIG_USE_BOOTARGS=y
CONFIG_BOOTARGS="console=ttyS0,115200 root=/dev/mmcblk0p2 rw noinitrd init=/linuxrc rootfstype=ext4 rootwait"
CONFIG_BOOTARGS="console=ttyS0,115200 rw noinitrd init=/sbin/init rootfstype=ext4 rootwait"
CONFIG_USE_BOOTCOMMAND=y
CONFIG_BOOTCOMMAND="setenv bootargs ${bootargs} mtdparts=${mtdparts};ext4load mmc 0:1 ${loadaddr} /uImage;bootm"
CONFIG_BOOTCOMMAND="setenv bootargs ${bootargs} root=/dev/mmcblk0p${syspart} mtdparts=${mtdparts} fbcon=rotate:${rotate} panel=${panel};sf probe;sf read ${fdt_addr} 0xF0000 ${fdt_size};ext4load mmc 0:${syspart} ${loadaddr} /boot/uImage;bootm"
# CONFIG_INIT_USB_INPUT_DEV_BOOT is not set
CONFIG_LOGLEVEL=7
CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE=y
# CONFIG_SYS_DEVICE_NULLDEV is not set
@@ -52,34 +61,36 @@ CONFIG_SPL_MTD_SUPPORT=y
CONFIG_SPL_DM_SPI_FLASH=y
CONFIG_SPL_SPI_FLASH_MTD=y
CONFIG_SPL_SPI_LOAD=y
# CONFIG_BOOTM_PLAN9 is not set
CONFIG_CMD_BOOTMENU=y
CONFIG_CMD_EEPROM=y
CONFIG_SYS_I2C_EEPROM_ADDR_LEN=2
CONFIG_SYS_EEPROM_SIZE=4096
CONFIG_SYS_EEPROM_PAGE_WRITE_BITS=4
CONFIG_SYS_EEPROM_PAGE_WRITE_DELAY_MS=3
CONFIG_CMD_MD5SUM=y
# CONFIG_CMD_XIMG is not set
# CONFIG_CMD_RANDOM is not set
CONFIG_CMD_MEMTEST=y
CONFIG_CMD_GPT=y
# CONFIG_RANDOM_UUID is not set
CONFIG_CMD_GPT_RENAME=y
CONFIG_CMD_MBR=y
CONFIG_CMD_MMC=y
CONFIG_CMD_MTD=y
CONFIG_CMD_POWEROFF=y
CONFIG_CMD_SF_TEST=y
CONFIG_CMD_USB=y
# CONFIG_CMD_ITEST is not set
CONFIG_CMD_DHCP=y
CONFIG_CMD_MII=y
CONFIG_CMD_PING=y
CONFIG_CMD_BMP=y
CONFIG_CMD_TIME=y
CONFIG_CMD_EXT2=y
CONFIG_CMD_EXT4=y
CONFIG_CMD_EXT4_WRITE=y
CONFIG_CMD_FAT=y
CONFIG_CMD_FS_GENERIC=y
CONFIG_CMD_MTDPARTS=y
CONFIG_MTDIDS_DEFAULT="nand0=ls-nand,nor0=spi0.0"
CONFIG_MTDPARTS_DEFAULT="ls-nand:14m(kernel),-(root);spi0.0:924k(uboot),32k(uboot_env),4k(bdinfo),56k(dtb),8k(ddr_context)"
CONFIG_MTDIDS_DEFAULT="nor0=spi0.0"
CONFIG_MTDPARTS_DEFAULT="spi0.0:924k(uboot),32k(uboot_env),4k(bdinfo),52k(dtb),4k(bdinfo_e),8k(ddr_context)"
CONFIG_ISO_PARTITION=y
# CONFIG_SPL_EFI_PARTITION is not set
CONFIG_OF_LIVE=y
CONFIG_OF_BOARD=y
CONFIG_OF_SPL_REMOVE_PROPS="interrupt-parent interrupts"
CONFIG_ENV_OVERWRITE=y
@@ -92,49 +103,35 @@ CONFIG_NET_RANDOM_ETHADDR=y
CONFIG_BOOTP_SERVERIP=y
CONFIG_SPL_DM=y
CONFIG_SPL_OF_TRANSLATE=y
CONFIG_BUTTON=y
CONFIG_BUTTON_GPIO=y
CONFIG_DMA=y
CONFIG_LOONGSON_DMA=y
CONFIG_DM_PCA953X=y
CONFIG_LOONGSON_GPIO=y
CONFIG_DM_I2C=y
CONFIG_SYS_I2C_OCORES=y
# CONFIG_I2C is not set
CONFIG_LED=y
CONFIG_LED_BLINK=y
CONFIG_LED_GPIO=y
CONFIG_MISC=y
CONFIG_I2C_EEPROM=y
CONFIG_SYS_I2C_EEPROM_ADDR=0x57
CONFIG_MMC=y
CONFIG_MMC_IO_VOLTAGE=y
CONFIG_MMC_UHS_SUPPORT=y
CONFIG_MMC_LOONGSON=y
CONFIG_MTD=y
CONFIG_DM_MTD=y
CONFIG_MTD_RAW_NAND=y
CONFIG_SYS_NAND_DRIVER_ECC_LAYOUT=y
CONFIG_NAND_LOONGSON=y
CONFIG_SYS_NAND_ONFI_DETECTION=y
CONFIG_DM_SPI_FLASH=y
CONFIG_SF_DEFAULT_SPEED=25000000
CONFIG_SPI_FLASH_EON=y
CONFIG_SPI_FLASH_GIGADEVICE=y
CONFIG_SPI_FLASH_WINBOND=y
CONFIG_SPI_FLASH_MTD=y
CONFIG_PHY_MARVELL=y
CONFIG_PHY_REALTEK=y
CONFIG_DM_ETH=y
CONFIG_DM_MDIO=y
CONFIG_DM_ETH_PHY=y
CONFIG_ETH_DESIGNWARE=y
CONFIG_RGMII=y
CONFIG_MII=y
CONFIG_PHY=y
CONFIG_PHY_LS2K_USB=y
CONFIG_PINCTRL=y
CONFIG_PINCTRL_SINGLE=y
CONFIG_DM_REGULATOR=y
CONFIG_DM_REGULATOR_GPIO=y
CONFIG_RAM=y
CONFIG_SPL_RAM=y
CONFIG_LOONGSON_DDR=y
CONFIG_LOONGSON_DDR4=y
CONFIG_SERIAL_RX_BUFFER=y
CONFIG_SYS_NS16550=y
CONFIG_SPI=y
@@ -147,6 +144,7 @@ CONFIG_USB_EHCI_HCD=y
CONFIG_USB_EHCI_GENERIC=y
CONFIG_USB_OHCI_HCD=y
CONFIG_USB_OHCI_GENERIC=y
CONFIG_USB_DWC2=y
CONFIG_USB_STORAGE=y
CONFIG_USB_KEYBOARD=y
CONFIG_USB_KEYBOARD_FN_KEYS=y
@@ -163,6 +161,10 @@ CONFIG_SPLASH_SCREEN_ALIGN=y
CONFIG_BMP_16BPP=y
CONFIG_BMP_24BPP=y
CONFIG_BMP_32BPP=y
# CONFIG_WATCHDOG is not set
# CONFIG_WATCHDOG_AUTOSTART is not set
CONFIG_WDT=y
CONFIG_WDT_LS2X=y
CONFIG_FAT_WRITE=y
CONFIG_BCH=y
CONFIG_PANIC_HANG=y
configs/loongson_2k300_mini_dp_defconfig
+2 -1
View File
@@ -23,6 +23,7 @@ CONFIG_SPL_SPI=y
CONFIG_ARCH_LA_LOONGSON=y
CONFIG_SOC_LS2K300=y
CONFIG_CPU_1000MHZ=y
CONFIG_TARGET_LS2K300_MINI_DP=y
CONFIG_LOONGSON_RECOVER=y
CONFIG_LOONGSON_GENERAL_LOAD=y
CONFIG_LOONGSON_BOARD_MMC_FS=y
@@ -84,7 +85,7 @@ CONFIG_CMD_FAT=y
CONFIG_CMD_FS_GENERIC=y
CONFIG_CMD_MTDPARTS=y
CONFIG_MTDIDS_DEFAULT="nor0=spi0.0"
CONFIG_MTDPARTS_DEFAULT="spi0.0:924k(uboot),32k(uboot_env),4k(bdinfo),56k(dtb),8k(ddr_context)"
CONFIG_MTDPARTS_DEFAULT="spi0.0:924k(uboot),32k(uboot_env),4k(bdinfo),52k(dtb),4k(bdinfo_e),8k(ddr_context)"
CONFIG_ISO_PARTITION=y
# CONFIG_SPL_EFI_PARTITION is not set
CONFIG_OF_LIVE=y
configs/loongson_2k300_pai_defconfig
+2 -1
View File
@@ -23,6 +23,7 @@ CONFIG_SPL_SPI=y
CONFIG_ARCH_LA_LOONGSON=y
CONFIG_SOC_LS2K300=y
CONFIG_CPU_1000MHZ=y
CONFIG_TARGET_LS2K300_PAI=y
CONFIG_LOONGSON_RECOVER=y
CONFIG_LOONGSON_GENERAL_LOAD=y
CONFIG_LOONGSON_BOARD_MMC_FS=y
@@ -88,7 +89,7 @@ CONFIG_CMD_FAT=y
CONFIG_CMD_FS_GENERIC=y
CONFIG_CMD_MTDPARTS=y
CONFIG_MTDIDS_DEFAULT="nor0=spi0.0"
CONFIG_MTDPARTS_DEFAULT="spi0.0:924k(uboot),32k(uboot_env),4k(bdinfo),56k(dtb),8k(ddr_context)"
CONFIG_MTDPARTS_DEFAULT="spi0.0:924k(uboot),32k(uboot_env),4k(bdinfo),52k(dtb),4k(bdinfo_e),8k(ddr_context)"
CONFIG_ISO_PARTITION=y
# CONFIG_SPL_EFI_PARTITION is not set
CONFIG_OF_LIVE=y
configs/loongson_2k500_mini_dp_defconfig
+1 -1
View File
@@ -73,7 +73,7 @@ CONFIG_CMD_FAT=y
CONFIG_CMD_FS_GENERIC=y
CONFIG_CMD_MTDPARTS=y
CONFIG_MTDIDS_DEFAULT="nand0=ls-nand,nor0=spi0.0"
CONFIG_MTDPARTS_DEFAULT="ls-nand:14m(kernel),-(root);spi0.0:924k(uboot),32k(uboot_env),4k(bdinfo),56k(dtb),8k(ddr_context)"
CONFIG_MTDPARTS_DEFAULT="ls-nand:14m(kernel),-(root);spi0.0:924k(uboot),32k(uboot_env),4k(bdinfo),52k(dtb),4k(bdinfo_e),8k(ddr_context)"
CONFIG_ISO_PARTITION=y
CONFIG_PARTITION_UUIDS=y
CONFIG_OF_LIVE=y
configs/loongson_2p500_gbkpjm0_defconfig
+4 -3
View File
@@ -22,9 +22,10 @@ CONFIG_SPL_SPI=y
CONFIG_ARCH_LA_LOONGSON=y
CONFIG_SOC_LS2P500=y
CONFIG_CPU_600MHZ=y
CONFIG_TARGET_LS2P500_RSJ=y
CONFIG_TARGET_LS2P500_GBKPJM=y
CONFIG_LOONGSON_RECOVER=y
CONFIG_LOONGSON_GENERAL_LOAD=y
# CONFIG_LOONGSON_GENERAL_LOAD_FIX_FDISK is not set
CONFIG_LOONGSON_BOARD_MMC_FS=y
CONFIG_SPL_PAYLOAD="u-boot.img"
CONFIG_PHYS_64BIT=y
@@ -37,7 +38,7 @@ CONFIG_AUTOBOOT_STOP_STR="c"
CONFIG_USE_BOOTARGS=y
CONFIG_BOOTARGS="console=ttyS0,115200 rw noinitrd init=/linuxrc rootfstype=ext4 rootwait"
CONFIG_USE_BOOTCOMMAND=y
CONFIG_BOOTCOMMAND="setenv bootargs ${bootargs} root=/dev/mmcblk0p${syspart} mtdparts=${mtdparts};ext4load mmc 0:${syspart} ${loadaddr} /boot/uImage;bootm"
CONFIG_BOOTCOMMAND="setenv bootargs ${bootargs} root=/dev/mmcblk0p${syspart} mtdparts=${mtdparts} fbcon=rotate:${rotate} panel=${panel};sf probe;sf read ${fdt_addr} 0xF0000 ${fdt_size};ext4load mmc 0:${syspart} ${loadaddr} /boot/uImage;bootm"
# CONFIG_INIT_USB_INPUT_DEV_BOOT is not set
CONFIG_LOGLEVEL=7
CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE=y
@@ -84,7 +85,7 @@ CONFIG_CMD_FAT=y
CONFIG_CMD_FS_GENERIC=y
CONFIG_CMD_MTDPARTS=y
CONFIG_MTDIDS_DEFAULT="nor0=spi0.0"
CONFIG_MTDPARTS_DEFAULT="spi0.0:924k(uboot),32k(uboot_env),4k(bdinfo),56k(dtb),8k(ddr_context)"
CONFIG_MTDPARTS_DEFAULT="spi0.0:924k(uboot),32k(uboot_env),4k(bdinfo),52k(dtb),4k(bdinfo_e),8k(ddr_context)"
CONFIG_ISO_PARTITION=y
# CONFIG_SPL_EFI_PARTITION is not set
CONFIG_OF_LIVE=y