mirror of
https://github.com/brain-hackers/u-boot-brain
synced 2024-06-09 23:36:03 +09:00
0f9258228e
We have flipped CONFIG_SPL_DISABLE_OF_CONTROL. We have cleansing devices, $(SPL_) and CONFIG_IS_ENABLED(), so we are ready to clear away the ugly logic in include/fdtdec.h: #ifdef CONFIG_OF_CONTROL # if defined(CONFIG_SPL_BUILD) && !defined(SPL_OF_CONTROL) # define OF_CONTROL 0 # else # define OF_CONTROL 1 # endif #else # define OF_CONTROL 0 #endif Now CONFIG_IS_ENABLED(OF_CONTROL) is the substitute. It refers to CONFIG_OF_CONTROL for U-boot proper and CONFIG_SPL_OF_CONTROL for SPL. Also, we no longer have to cancel CONFIG_OF_CONTROL in include/config_uncmd_spl.h and scripts/Makefile.spl. Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com> Reviewed-by: Tom Rini <trini@konsulko.com> Reviewed-by: Simon Glass <sjg@chromium.org> Acked-by: Linus Walleij <linus.walleij@linaro.org>
55 lines
1.1 KiB
C
55 lines
1.1 KiB
C
/*
|
|
* Copyright (c) 2014 Google, Inc
|
|
*
|
|
* SPDX-License-Identifier: GPL-2.0+
|
|
*/
|
|
|
|
#include <common.h>
|
|
#include <dm.h>
|
|
#include <ns16550.h>
|
|
#include <serial.h>
|
|
|
|
#if CONFIG_IS_ENABLED(OF_CONTROL)
|
|
static const struct udevice_id tegra_serial_ids[] = {
|
|
{ .compatible = "nvidia,tegra20-uart" },
|
|
{ }
|
|
};
|
|
|
|
static int tegra_serial_ofdata_to_platdata(struct udevice *dev)
|
|
{
|
|
struct ns16550_platdata *plat = dev_get_platdata(dev);
|
|
int ret;
|
|
|
|
ret = ns16550_serial_ofdata_to_platdata(dev);
|
|
if (ret)
|
|
return ret;
|
|
plat->clock = V_NS16550_CLK;
|
|
|
|
return 0;
|
|
}
|
|
#else
|
|
struct ns16550_platdata tegra_serial = {
|
|
.base = CONFIG_SYS_NS16550_COM1,
|
|
.reg_shift = 2,
|
|
.clock = V_NS16550_CLK,
|
|
};
|
|
|
|
U_BOOT_DEVICE(ns16550_serial) = {
|
|
"serial_tegra20", &tegra_serial
|
|
};
|
|
#endif
|
|
|
|
U_BOOT_DRIVER(serial_ns16550) = {
|
|
.name = "serial_tegra20",
|
|
.id = UCLASS_SERIAL,
|
|
#if CONFIG_IS_ENABLED(OF_CONTROL)
|
|
.of_match = tegra_serial_ids,
|
|
.ofdata_to_platdata = tegra_serial_ofdata_to_platdata,
|
|
.platdata_auto_alloc_size = sizeof(struct ns16550_platdata),
|
|
#endif
|
|
.priv_auto_alloc_size = sizeof(struct NS16550),
|
|
.probe = ns16550_serial_probe,
|
|
.ops = &ns16550_serial_ops,
|
|
.flags = DM_FLAG_PRE_RELOC,
|
|
};
|