diff options
| author | Tom Rini <trini@konsulko.com> | 2023-04-30 21:29:50 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2023-04-30 21:29:50 -0400 |
| commit | 27dc8826441f0c5dd6aa6617a32909d9049f1202 (patch) | |
| tree | 18a2dcc2249614fe95b52983a5abe5e992d74840 /lib/fdtdec.c | |
| parent | fe3a77cb157a6210d8036845f5f80ea67c183563 (diff) | |
| parent | 25bc7bfc30532098d9207783ff2ca45cdc5a0161 (diff) | |
| download | u-boot-27dc8826441f0c5dd6aa6617a32909d9049f1202.tar.gz | |
Merge branch 'master' of https://source.denx.de/u-boot/custodians/u-boot-sunxi
Please pull the second part of the sunxi pull request for this cycle.
Another bunch of patches that replace old-school U-Boot hacks with
proper DM based code, this time for the raw NAND flash driver, and the
USB PHY VBUS detection code. Plus two smaller patches that were sitting
in my inbox for a while.
Gitlab CI passed. In lack of some supported board with NAND flash I
couldn't really test this part, but apparently this was tested by the
reviewer. I briefly ran the branch on some boards with USB-OTG, and
this still worked.
Diffstat (limited to 'lib/fdtdec.c')
| -rw-r--r-- | lib/fdtdec.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/lib/fdtdec.c b/lib/fdtdec.c index 55cc95db5d..c60972dfbe 100644 --- a/lib/fdtdec.c +++ b/lib/fdtdec.c @@ -68,7 +68,6 @@ static const char * const compat_names[COMPAT_COUNT] = { COMPAT(INTEL_BAYTRAIL_FSP, "intel,baytrail-fsp"), COMPAT(INTEL_BAYTRAIL_FSP_MDP, "intel,baytrail-fsp-mdp"), COMPAT(INTEL_IVYBRIDGE_FSP, "intel,ivybridge-fsp"), - COMPAT(COMPAT_SUNXI_NAND, "allwinner,sun4i-a10-nand"), COMPAT(ALTERA_SOCFPGA_CLK, "altr,clk-mgr"), COMPAT(ALTERA_SOCFPGA_PINCTRL_SINGLE, "pinctrl-single"), COMPAT(ALTERA_SOCFPGA_H2F_BRG, "altr,socfpga-hps2fpga-bridge"), |