diff options
Diffstat (limited to 'package/boot/uboot-at91')
| -rw-r--r-- | package/boot/uboot-at91/Makefile | 62 | ||||
| -rw-r--r-- | package/boot/uboot-at91/patches/001-fix-Wformat-security.patch | 46 |
2 files changed, 78 insertions, 30 deletions
diff --git a/package/boot/uboot-at91/Makefile b/package/boot/uboot-at91/Makefile index a8a71239a39..afab24e8415 100644 --- a/package/boot/uboot-at91/Makefile +++ b/package/boot/uboot-at91/Makefile @@ -7,13 +7,13 @@ include $(TOPDIR)/rules.mk -PKG_VERSION:=linux4sam-2020.04 -PKG_RELEASE:=2 +PKG_VERSION:=linux4sam-2022.04 +PKG_RELEASE:=3 PKG_SOURCE_PROTO:=git PKG_SOURCE_URL:=https://github.com/linux4sam/u-boot-at91.git -PKG_MIRROR_HASH:=4f106d215c01c4d024c4612bbd3ef189188d19abc1ab2cc316b257d308534feb -PKG_SOURCE_VERSION:=0e1d1b6efb7f8e27c372279a906fcd2524df09da +PKG_MIRROR_HASH:=56bbac45f71aaf39b365661db2a76c6c8415e27f7147b27bb58312b12756c8f3 +PKG_SOURCE_VERSION:=7b59654a486d39dc8e0343e2554699b8a79c7a54 include $(INCLUDE_DIR)/u-boot.mk include $(INCLUDE_DIR)/package.mk @@ -47,6 +47,18 @@ define U-Boot/at91sam9x5ek_mmc atmel_at91sam9x35ek endef +define U-Boot/sam9x60ek_nandflash + NAME:=SAM9X60-EK board (NandFlash) + BUILD_SUBTARGET:=sam9x + BUILD_DEVICES:=microchip_sam9x60ek +endef + +define U-Boot/sam9x60ek_mmc + NAME:=SAM9X60-EK board (SDcard) + BUILD_SUBTARGET:=sam9x + BUILD_DEVICES:=microchip_sam9x60ek +endef + define U-Boot/sama5d3_xplained_nandflash NAME:=SAMA5D3 Xplained board (NandFlash) BUILD_SUBTARGET:=sama5 @@ -59,6 +71,12 @@ define U-Boot/sama5d3_xplained_mmc BUILD_DEVICES:=microchip_sama5d3-xplained endef +define U-Boot/sama5d2_icp_mmc + NAME:=SAMA5D2 ICP board (SDCard) + BUILD_SUBTARGET:=sama5 + BUILD_DEVICES:=microchip_sama5d2-icp +endef + define U-Boot/sama5d2_xplained_spiflash NAME:=SAMA5D2 Xplained board (SPI Flash) BUILD_SUBTARGET:=sama5 @@ -89,8 +107,8 @@ define U-Boot/sama5d4_xplained_nandflash BUILD_DEVICES:=microchip_sama5d3-xplained endef -define U-Boot/sama5d27_som1_ek_mmc1 - NAME:=SAMA5D27 SOM1 Ek (SDCard1) +define U-Boot/sama5d27_som1_ek_mmc + NAME:=SAMA5D27 SOM1 Ek (SDCard0) BUILD_SUBTARGET:=sama5 BUILD_DEVICES:=microchip_sama5d27-som1-ek endef @@ -101,6 +119,18 @@ define U-Boot/sama5d27_som1_ek_qspiflash BUILD_DEVICES:=microchip_sama5d27-som1-ek endef +define U-Boot/sama5d27_wlsom1_ek_mmc + NAME:=SAMA5D27 WLSOM1 Ek (SDCard) + BUILD_SUBTARGET:=sama5 + BUILD_DEVICES:=microchip_sama5d27-wlsom1-ek +endef + +define U-Boot/sama5d27_wlsom1_ek_qspiflash + NAME:=SAMA5D27 WLSOM1 Ek (QSPI Flash) + BUILD_SUBTARGET:=sama5 + BUILD_DEVICES:=microchip_sama5d27-wlsom1-ek +endef + define U-Boot/sama5d2_ptc_ek_nandflash NAME:=SAMA5D2 PTC Ek (Nand Flash) BUILD_SUBTARGET:=sama5 @@ -113,28 +143,40 @@ define U-Boot/sama5d2_ptc_ek_mmc BUILD_DEVICES:=microchip_sama5d2-ptc-ek endef +define U-Boot/sama7g5ek_mmc1 + NAME:=SAMA7G5-EK (SDCard) + BUILD_SUBTARGET:=sama7 + BUILD_DEVICES:=microchip_sama7g5-ek +endef + UBOOT_TARGETS := \ at91sam9m10g45ek_nandflash \ at91sam9x5ek_nandflash \ at91sam9x5ek_mmc \ + sam9x60ek_nandflash \ + sam9x60ek_mmc \ sama5d3_xplained_nandflash \ sama5d3_xplained_mmc \ + sama5d2_icp_mmc \ sama5d2_xplained_mmc \ sama5d2_xplained_spiflash \ sama5d4_xplained_mmc \ sama5d4_xplained_spiflash \ sama5d4_xplained_nandflash\ - sama5d27_som1_ek_mmc1 \ + sama5d27_som1_ek_mmc \ sama5d27_som1_ek_qspiflash \ + sama5d27_wlsom1_ek_mmc \ + sama5d27_wlsom1_ek_qspiflash \ sama5d2_ptc_ek_nandflash \ - sama5d2_ptc_ek_mmc + sama5d2_ptc_ek_mmc \ + sama7g5ek_mmc1 define Build/Compile +$(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR) \ CROSS_COMPILE=$(TARGET_CROSS) \ - DTC=$(PKG_BUILD_DIR)/scripts/dtc/dtc \ KCFLAGS="$(filter-out -fstack-protector \ - -mfloat-abi=hard, $(TARGET_CFLAGS)) -mfloat-abi=soft" + -mfloat-abi=hard, $(TARGET_CFLAGS)) -mfloat-abi=soft" \ + $(UBOOT_MAKE_FLAGS) endef $(eval $(call BuildPackage/U-Boot)) diff --git a/package/boot/uboot-at91/patches/001-fix-Wformat-security.patch b/package/boot/uboot-at91/patches/001-fix-Wformat-security.patch index 23cb5828b34..de92dd41670 100644 --- a/package/boot/uboot-at91/patches/001-fix-Wformat-security.patch +++ b/package/boot/uboot-at91/patches/001-fix-Wformat-security.patch @@ -1,21 +1,40 @@ -diff --git a/cmd/version.c b/cmd/version.c -index b2fffe99..bcbbeb18 100644 +From 3b05406c02070df3e7f19399d81ebd35ed6deae5 Mon Sep 17 00:00:00 2001 +From: Claudiu Beznea <claudiu.beznea@microchip.com> +Date: Tue, 12 Oct 2021 17:43:28 +0300 +Subject: [PATCH] fix -Wformat-security + +Signed-off-by: Claudiu Beznea <claudiu.beznea@microchip.com> +--- + cmd/panic.c | 2 +- + cmd/version.c | 2 +- + drivers/pinctrl/pinctrl-uclass.c | 2 +- + 3 files changed, 3 insertions(+), 3 deletions(-) + +--- a/cmd/panic.c ++++ b/cmd/panic.c +@@ -11,7 +11,7 @@ static int do_panic(struct cmd_tbl *cmdt + { + char *text = (argc < 2) ? "" : argv[1]; + +- panic(text); ++ panic("%s\n", text); + + return CMD_RET_SUCCESS; + } --- a/cmd/version.c +++ b/cmd/version.c -@@ -18,7 +18,7 @@ static int do_version(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) +@@ -24,7 +24,7 @@ static int do_version(struct cmd_tbl *cm { char buf[DISPLAY_OPTIONS_BANNER_LENGTH]; - printf(display_options_get_banner(false, buf, sizeof(buf))); -+ printf("%s",display_options_get_banner(false, buf, sizeof(buf))); ++ printf("%s", display_options_get_banner(false, buf, sizeof(buf))); #ifdef CC_VERSION_STRING puts(CC_VERSION_STRING "\n"); #endif -diff --git a/drivers/pinctrl/pinctrl-uclass.c b/drivers/pinctrl/pinctrl-uclass.c -index 3425ed11..8c2e1d5c 100644 --- a/drivers/pinctrl/pinctrl-uclass.c +++ b/drivers/pinctrl/pinctrl-uclass.c -@@ -368,7 +368,7 @@ int pinctrl_get_pin_name(struct udevice *dev, int selector, char *buf, +@@ -375,7 +375,7 @@ int pinctrl_get_pin_name(struct udevice if (!ops->get_pin_name) return -ENOSYS; @@ -24,16 +43,3 @@ index 3425ed11..8c2e1d5c 100644 return 0; } -diff --git a/lib/efi_loader/efi_variable.c b/lib/efi_loader/efi_variable.c -index c316bdfe..5fe8129c 100644 ---- a/lib/efi_loader/efi_variable.c -+++ b/lib/efi_loader/efi_variable.c -@@ -522,7 +522,7 @@ efi_status_t EFIAPI efi_set_variable(u16 *variable_name, - - if (old_size) - /* APPEND_WRITE */ -- s += sprintf(s, old_val); -+ s += sprintf(s, "%s", old_val); - else - s += sprintf(s, "(blob)"); - |