diff options
| author | Tom Rini <trini@konsulko.com> | 2020-06-04 18:12:57 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2020-06-04 18:12:57 -0400 |
| commit | 6bca655bcbc8e81a21ab27a0d1e9c711ab8e0e24 (patch) | |
| tree | 047f05ad2648c4b88ff5e02187e92a9e7835e8ae /include/configs/sama5d2_icp.h | |
| parent | 07d90d8bd451b9595fb0369c51f90ee2dccd5d9f (diff) | |
| parent | f3e2ebede3019740ee90471acc0a29a684b59221 (diff) | |
Merge branch '2020-06-04-misc-bugfixes'
- Resync checkpatch.pl (largely) with v5.7 and introduce U-Boot specific
checks in a localized area, so they aren't lost in the future.
- Complete / re-migrate some options from config headers to defconfigs
- Add dependencies to the various debug uart drivers
Diffstat (limited to 'include/configs/sama5d2_icp.h')
| -rw-r--r-- | include/configs/sama5d2_icp.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/configs/sama5d2_icp.h b/include/configs/sama5d2_icp.h index 17028ca145..2d1ba757fe 100644 --- a/include/configs/sama5d2_icp.h +++ b/include/configs/sama5d2_icp.h @@ -30,7 +30,6 @@ #define CONFIG_SYS_LOAD_ADDR 0x22000000 /* load address */ /* NAND flash */ -#undef CONFIG_CMD_NAND /* SPI flash */ #define CONFIG_SF_DEFAULT_SPEED 66000000 |