Merge branch '2018-12-15-master-imports'

- Introduce tools-only build for host tools
- Bugfixes to poplar, syscon and the hashtable, a tee return code
- Fix a warning on gcc-8 by reworking part of mtk_image to be not unsafe
  wrt strings.
- serial_stm32 reset support
This commit is contained in:
Tom Rini 2018-12-15 17:47:28 -05:00
commit 0dc526d98e
17 changed files with 69 additions and 55 deletions

View file

@ -336,6 +336,10 @@ matrix:
- name: "Check for configs without MAINTAINERS entry" - name: "Check for configs without MAINTAINERS entry"
script: script:
- if [ `./tools/genboardscfg.py -f 2>&1 | wc -l` -ne 0 ]; then exit 1; fi - if [ `./tools/genboardscfg.py -f 2>&1 | wc -l` -ne 0 ]; then exit 1; fi
# Ensure host tools build
- name: "Build tools-only"
script:
- make tools-only_config tools-only -j$(nproc)
# test/py # test/py
- name: "test/py sandbox" - name: "test/py sandbox"

View file

@ -719,5 +719,6 @@ L: u-boot@lists.denx.de
Q: http://patchwork.ozlabs.org/project/uboot/list/ Q: http://patchwork.ozlabs.org/project/uboot/list/
S: Maintained S: Maintained
T: git git://git.denx.de/u-boot.git T: git git://git.denx.de/u-boot.git
F: configs/tools-only_defconfig
F: * F: *
F: */ F: */

View file

@ -724,8 +724,7 @@ libs-y += common/
libs-y += env/ libs-y += env/
libs-$(CONFIG_API) += api/ libs-$(CONFIG_API) += api/
libs-$(CONFIG_HAS_POST) += post/ libs-$(CONFIG_HAS_POST) += post/
libs-y += test/ libs-$(CONFIG_UNIT_TEST) += test/ test/dm/
libs-y += test/dm/
libs-$(CONFIG_UT_ENV) += test/env/ libs-$(CONFIG_UT_ENV) += test/env/
libs-$(CONFIG_UT_OVERLAY) += test/overlay/ libs-$(CONFIG_UT_OVERLAY) += test/overlay/

View file

@ -17,12 +17,6 @@
}; };
&uart0 { &uart0 {
status = "disabled"; clock = <75000000>;
status = "okay";
}; };
/{
chosen {
stdout-path = "";
};
};

View file

@ -1,5 +1,6 @@
Poplar BOARD Poplar BOARD
M: Jorge Ramirez-Ortiz <jorge.ramirez-ortiz@linaro.org> M: Jorge Ramirez-Ortiz <jorge.ramirez-ortiz@linaro.org>
M: Shawn Guo <shawn.guo@linaro.org>
S: Maintained S: Maintained
F: board/hisilicon/poplar F: board/hisilicon/poplar
F: include/configs/poplar.h F: include/configs/poplar.h

View file

@ -35,6 +35,7 @@ static struct mm_region poplar_mem_map[] = {
struct mm_region *mem_map = poplar_mem_map; struct mm_region *mem_map = poplar_mem_map;
#if !CONFIG_IS_ENABLED(OF_CONTROL)
static const struct pl01x_serial_platdata serial_platdata = { static const struct pl01x_serial_platdata serial_platdata = {
.base = REG_BASE_UART0, .base = REG_BASE_UART0,
.type = TYPE_PL010, .type = TYPE_PL010,
@ -45,6 +46,7 @@ U_BOOT_DEVICE(poplar_serial) = {
.name = "serial_pl01x", .name = "serial_pl01x",
.platdata = &serial_platdata, .platdata = &serial_platdata,
}; };
#endif
int checkboard(void) int checkboard(void)
{ {

View file

@ -40,6 +40,7 @@ obj-$(CONFIG_CMD_CPU) += cpu.o
obj-$(CONFIG_DATAFLASH_MMC_SELECT) += dataflash_mmc_mux.o obj-$(CONFIG_DATAFLASH_MMC_SELECT) += dataflash_mmc_mux.o
obj-$(CONFIG_CMD_DATE) += date.o obj-$(CONFIG_CMD_DATE) += date.o
obj-$(CONFIG_CMD_DEMO) += demo.o obj-$(CONFIG_CMD_DEMO) += demo.o
obj-$(CONFIG_CMD_DM) += dm.o
obj-$(CONFIG_CMD_SOUND) += sound.o obj-$(CONFIG_CMD_SOUND) += sound.o
ifdef CONFIG_POST ifdef CONFIG_POST
obj-$(CONFIG_CMD_DIAG) += diag.o obj-$(CONFIG_CMD_DIAG) += diag.o

View file

@ -0,0 +1,24 @@
CONFIG_SYS_TEXT_BASE=0
CONFIG_ANDROID_BOOT_IMAGE=y
CONFIG_FIT=y
CONFIG_FIT_SIGNATURE=y
# CONFIG_CMD_BOOTD is not set
# CONFIG_CMD_BOOTM is not set
# CONFIG_CMD_ELF is not set
# CONFIG_CMD_DATE is not set
CONFIG_OF_CONTROL=y
CONFIG_OF_HOSTFILE=y
CONFIG_DEFAULT_DEVICE_TREE="sandbox"
# CONFIG_UDP_FUNCTION_FASTBOOT is not set
CONFIG_SANDBOX_GPIO=y
CONFIG_DM_I2C_COMPAT=y
CONFIG_PCI=y
CONFIG_DM_PCI=y
CONFIG_PCI_SANDBOX=y
CONFIG_DM_RTC=y
CONFIG_SOUND=y
CONFIG_SYSRESET=y
# CONFIG_VIRTIO_MMIO is not set
# CONFIG_VIRTIO_PCI is not set
# CONFIG_VIRTIO_SANDBOX is not set
# CONFIG_EFI_LOADER is not set

View file

@ -146,52 +146,31 @@ U_BOOT_DRIVER(generic_syscon) = {
* The syscon node can be bound to another driver, but still works * The syscon node can be bound to another driver, but still works
* as a syscon provider. * as a syscon provider.
*/ */
static LIST_HEAD(syscon_list); struct regmap *syscon_node_to_regmap(ofnode node)
struct syscon {
ofnode node;
struct regmap *regmap;
struct list_head list;
};
static struct syscon *of_syscon_register(ofnode node)
{ {
struct syscon *syscon; struct udevice *dev, *parent;
int ret; int ret;
if (!uclass_get_device_by_ofnode(UCLASS_SYSCON, node, &dev))
return syscon_get_regmap(dev);
if (!ofnode_device_is_compatible(node, "syscon")) if (!ofnode_device_is_compatible(node, "syscon"))
return ERR_PTR(-EINVAL); return ERR_PTR(-EINVAL);
syscon = malloc(sizeof(*syscon)); /* bound to driver with same ofnode or to root if not found */
if (!syscon) if (device_find_global_by_ofnode(node, &parent))
return ERR_PTR(-ENOMEM); parent = dm_root();
ret = regmap_init_mem(node, &syscon->regmap); /* force bound to syscon class */
if (ret) { ret = device_bind_driver_to_node(parent, "syscon",
free(syscon); ofnode_get_name(node),
node, &dev);
if (ret)
return ERR_PTR(ret); return ERR_PTR(ret);
}
list_add_tail(&syscon->list, &syscon_list); ret = device_probe(dev);
if (ret)
return ERR_PTR(ret);
return syscon; return syscon_get_regmap(dev);
}
struct regmap *syscon_node_to_regmap(ofnode node)
{
struct syscon *entry, *syscon = NULL;
list_for_each_entry(entry, &syscon_list, list)
if (ofnode_equal(entry->node, node)) {
syscon = entry;
break;
}
if (!syscon)
syscon = of_syscon_register(node);
if (IS_ERR(syscon))
return ERR_CAST(syscon);
return syscon->regmap;
} }

View file

@ -7,6 +7,7 @@
#include <common.h> #include <common.h>
#include <clk.h> #include <clk.h>
#include <dm.h> #include <dm.h>
#include <reset.h>
#include <serial.h> #include <serial.h>
#include <watchdog.h> #include <watchdog.h>
#include <asm/io.h> #include <asm/io.h>
@ -171,6 +172,7 @@ static int stm32_serial_probe(struct udevice *dev)
{ {
struct stm32x7_serial_platdata *plat = dev_get_platdata(dev); struct stm32x7_serial_platdata *plat = dev_get_platdata(dev);
struct clk clk; struct clk clk;
struct reset_ctl reset;
int ret; int ret;
plat->uart_info = (struct stm32_uart_info *)dev_get_driver_data(dev); plat->uart_info = (struct stm32_uart_info *)dev_get_driver_data(dev);
@ -185,6 +187,13 @@ static int stm32_serial_probe(struct udevice *dev)
return ret; return ret;
} }
ret = reset_get_by_index(dev, 0, &reset);
if (!ret) {
reset_assert(&reset);
udelay(2);
reset_deassert(&reset);
}
plat->clock_rate = clk_get_rate(&clk); plat->clock_rate = clk_get_rate(&clk);
if (plat->clock_rate < 0) { if (plat->clock_rate < 0) {
clk_disable(&clk); clk_disable(&clk);

View file

@ -82,8 +82,8 @@ void optee_suppl_cmd(struct udevice *dev, struct tee_shm *shm_arg,
cmd_shm_free(arg); cmd_shm_free(arg);
break; break;
case OPTEE_MSG_RPC_CMD_FS: case OPTEE_MSG_RPC_CMD_FS:
debug("OPTEE_MSG_RPC_CMD_FS not implemented\n"); debug("REE FS storage isn't available\n");
arg->ret = TEE_ERROR_NOT_IMPLEMENTED; arg->ret = TEE_ERROR_STORAGE_NOT_AVAILABLE;
break; break;
case OPTEE_MSG_RPC_CMD_RPMB: case OPTEE_MSG_RPC_CMD_RPMB:
optee_suppl_cmd_rpmb(dev, arg); optee_suppl_cmd_rpmb(dev, arg);

View file

@ -34,6 +34,7 @@
* struct tee_version_data::gen_caps * struct tee_version_data::gen_caps
*/ */
#define TEE_SUCCESS 0x00000000 #define TEE_SUCCESS 0x00000000
#define TEE_ERROR_STORAGE_NOT_AVAILABLE 0xf0100003
#define TEE_ERROR_GENERIC 0xffff0000 #define TEE_ERROR_GENERIC 0xffff0000
#define TEE_ERROR_BAD_PARAMETERS 0xffff0006 #define TEE_ERROR_BAD_PARAMETERS 0xffff0006
#define TEE_ERROR_ITEM_NOT_FOUND 0xffff0008 #define TEE_ERROR_ITEM_NOT_FOUND 0xffff0008

View file

@ -662,7 +662,7 @@ ssize_t hexport_r(struct hsearch_data *htab, const char sep, int flag,
return (-1); return (-1);
} }
} else { } else {
size = totlen; size = totlen + 1;
} }
/* Check if the user provided a buffer */ /* Check if the user provided a buffer */

View file

@ -2,7 +2,6 @@
# #
# Copyright (c) 2013 Google, Inc # Copyright (c) 2013 Google, Inc
obj-$(CONFIG_CMD_DM) += cmd_dm.o
obj-$(CONFIG_UT_DM) += bus.o obj-$(CONFIG_UT_DM) += bus.o
obj-$(CONFIG_UT_DM) += test-driver.o obj-$(CONFIG_UT_DM) += test-driver.o
obj-$(CONFIG_UT_DM) += test-fdt.o obj-$(CONFIG_UT_DM) += test-fdt.o

View file

@ -126,7 +126,7 @@ fit_info-objs := $(dumpimage-mkimage-objs) fit_info.o
fit_check_sign-objs := $(dumpimage-mkimage-objs) fit_check_sign.o fit_check_sign-objs := $(dumpimage-mkimage-objs) fit_check_sign.o
file2include-objs := file2include.o file2include-objs := file2include.o
ifneq ($(CONFIG_MX23)$(CONFIG_MX28),) ifneq ($(CONFIG_MX23)$(CONFIG_MX28)$(CONFIG_FIT_SIGNATURE),)
# Add CONFIG_MXS into host CFLAGS, so we can check whether or not register # Add CONFIG_MXS into host CFLAGS, so we can check whether or not register
# the mxsimage support within tools/mxsimage.c . # the mxsimage support within tools/mxsimage.c .
HOSTCFLAGS_mxsimage.o += -DCONFIG_MXS HOSTCFLAGS_mxsimage.o += -DCONFIG_MXS

View file

@ -322,7 +322,7 @@ static int mtk_brom_parse_imagename(const char *imagename)
lk = val; lk = val;
if (!strcmp(key, "lkname")) if (!strcmp(key, "lkname"))
strncpy(lk_name, val, sizeof(lk_name)); snprintf(lk_name, sizeof(lk_name), "%s", val);
} }
if (next) if (next)
@ -656,7 +656,7 @@ static void mtk_image_set_gen_header(void *ptr, off_t filesize,
bootname = SDMMC_BOOT_NAME; bootname = SDMMC_BOOT_NAME;
/* Generic device header */ /* Generic device header */
strncpy(hdr->boot.name, bootname, sizeof(hdr->boot.name)); snprintf(hdr->boot.name, sizeof(hdr->boot.name), "%s", bootname);
hdr->boot.version = cpu_to_le32(1); hdr->boot.version = cpu_to_le32(1);
hdr->boot.size = cpu_to_le32(sizeof(hdr->boot)); hdr->boot.size = cpu_to_le32(sizeof(hdr->boot));