colin/u-boot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch '2021-12-01-assorted-updates' into next

Browse Source 
- Have SPL skip length 0 images, some clean-ups related to CONFIG
  symbols and the known list of unmigrated symbols and pinctrl updates.
This commit is contained in:
Tom Rini
2021-12-02 07:12:28 -05:00
parent fc47dbb26e 6d99f86695
commit cdccb39e37
5 changed files with 23 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
common/spl/spl_fit.c
View File

@@ -286,6 +286,13 @@ static int spl_load_fit_image(struct spl_load_info *info, ulong sector,
if (fit_image_get_data_size(fit, node, &len)) if (fit_image_get_data_size(fit, node, &len))
return -ENOENT; return -ENOENT;
/* Dont bother to copy 0 byte data, but warn, though */
if (!len) {
log_warning("%s: Skip load '%s': image size is 0!\n",
__func__, fit_get_name(fit, node, NULL));
return 0;
}
src_ptr = map_sysmem(ALIGN(load_addr, ARCH_DMA_MINALIGN), len); src_ptr = map_sysmem(ALIGN(load_addr, ARCH_DMA_MINALIGN), len);
length = len; length = len;

16
drivers/core/device.c
View File

@@ -533,8 +533,12 @@ int device_probe(struct udevice *dev)
* is set just above. However, the PCI bus' probe() method and * is set just above. However, the PCI bus' probe() method and
* associated uclass methods have not yet been called. * associated uclass methods have not yet been called.
*/ */
if (dev->parent && device_get_uclass_id(dev) != UCLASS_PINCTRL) if (dev->parent && device_get_uclass_id(dev) != UCLASS_PINCTRL) {
pinctrl_select_state(dev, "default"); ret = pinctrl_select_state(dev, "default");
if (ret && ret != -ENOSYS)
log_debug("Device '%s' failed to configure default pinctrl: %d (%s)\n",
dev->name, ret, errno_str(ret));
}
if (CONFIG_IS_ENABLED(POWER_DOMAIN) && dev->parent && if (CONFIG_IS_ENABLED(POWER_DOMAIN) && dev->parent &&
(device_get_uclass_id(dev) != UCLASS_POWER_DOMAIN) && (device_get_uclass_id(dev) != UCLASS_POWER_DOMAIN) &&
@@ -586,8 +590,12 @@ int device_probe(struct udevice *dev)
if (ret) if (ret)
goto fail_uclass; goto fail_uclass;
if (dev->parent && device_get_uclass_id(dev) == UCLASS_PINCTRL) if (dev->parent && device_get_uclass_id(dev) == UCLASS_PINCTRL) {
pinctrl_select_state(dev, "default"); ret = pinctrl_select_state(dev, "default");
if (ret && ret != -ENOSYS)
log_debug("Device '%s' failed to configure default pinctrl: %d (%s)\n",
dev->name, ret, errno_str(ret));
}
return 0; return 0;
fail_uclass: fail_uclass:

4
include/dm/pinctrl.h
View File

@@ -495,7 +495,7 @@ int pinctrl_generic_set_state(struct udevice *pctldev, struct udevice *config);
static inline int pinctrl_generic_set_state(struct udevice *pctldev, static inline int pinctrl_generic_set_state(struct udevice *pctldev,
struct udevice *config) struct udevice *config)
{ {
return -EINVAL; return -ENOSYS;
} }
#endif #endif
@@ -512,7 +512,7 @@ int pinctrl_select_state(struct udevice *dev, const char *statename);
static inline int pinctrl_select_state(struct udevice *dev, static inline int pinctrl_select_state(struct udevice *dev,
const char *statename) const char *statename)
{ {
return -EINVAL; return -ENOSYS;
} }
#endif #endif

3
scripts/Makefile.autoconf
View File

@@ -67,7 +67,8 @@ quiet_cmd_autoconf = GEN $@
quiet_cmd_u_boot_cfg = CFG $@ quiet_cmd_u_boot_cfg = CFG $@
cmd_u_boot_cfg = \ cmd_u_boot_cfg = \
$(CPP) $(c_flags) $2 -DDO_DEPS_ONLY -dM $(srctree)/include/common.h > $@.tmp && { \ $(CPP) $(c_flags) $2 -DDO_DEPS_ONLY -dM $(srctree)/include/common.h > $@.tmp && { \
grep 'define CONFIG_' $@.tmp > $@; \ grep 'define CONFIG_' $@.tmp | \
sed '/define CONFIG_IS_ENABLED(/d;/define CONFIG_VAL(/d;' > $@; \
rm $@.tmp; \ rm $@.tmp; \
} || { \ } || { \
rm $@.tmp; false; \ rm $@.tmp; false; \

2
scripts/config_whitelist.txt
View File

@@ -633,7 +633,6 @@ CONFIG_IRAM_SIZE
CONFIG_IRAM_STACK CONFIG_IRAM_STACK
CONFIG_IRAM_TOP CONFIG_IRAM_TOP
CONFIG_IRDA_BASE CONFIG_IRDA_BASE
CONFIG_IS_ENABLED
CONFIG_JFFS2_DEV CONFIG_JFFS2_DEV
CONFIG_JFFS2_LZO CONFIG_JFFS2_LZO
CONFIG_JFFS2_NAND CONFIG_JFFS2_NAND
@@ -3042,7 +3041,6 @@ CONFIG_USE_ONENAND_BOARD_INIT
CONFIG_UTBIPAR_INIT_TBIPA CONFIG_UTBIPAR_INIT_TBIPA
CONFIG_U_BOOT_HDR_ADDR CONFIG_U_BOOT_HDR_ADDR
CONFIG_U_BOOT_HDR_SIZE CONFIG_U_BOOT_HDR_SIZE
CONFIG_VAL
CONFIG_VAR_SIZE_SPL CONFIG_VAR_SIZE_SPL
CONFIG_VERY_BIG_RAM CONFIG_VERY_BIG_RAM
CONFIG_VIDEO_BCM2835 CONFIG_VIDEO_BCM2835