From: Marek Szyprowski Date: Thu, 3 Dec 2020 10:55:29 +0000 (+0100) Subject: tizen: avoid doubled entries in params.bin X-Git-Tag: accepted/tizen/unified/20221108.163909~141 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=139d2c7e748c77e5d2f42006f88b460c8eb04e7d;p=platform%2Fkernel%2Fu-boot.git tizen: avoid doubled entries in params.bin Disable generating entries (re)defined in tizen_amlogic.h to avoid confusing user, which one is valid. Signed-off-by: Marek Szyprowski Change-Id: I123c58b8fb71320e20815bbb0eebb3cb3b5c5a9e --- diff --git a/include/configs/meson64.h b/include/configs/meson64.h index c7cfec7d2f..005950d147 100644 --- a/include/configs/meson64.h +++ b/include/configs/meson64.h @@ -92,7 +92,6 @@ "pxefile_addr_r=0x01080000\0" \ "fdtoverlay_addr_r=0x01000000\0" \ "ramdisk_addr_r=0x13000000\0" \ - "fdtfile=amlogic/" CONFIG_DEFAULT_DEVICE_TREE ".dtb\0" \ BOOTENV \ TIZEN_ENV_SETTING #endif diff --git a/include/samsung/tizen_amlogic.h b/include/samsung/tizen_amlogic.h index 822dbf0664..b1c0031991 100644 --- a/include/samsung/tizen_amlogic.h +++ b/include/samsung/tizen_amlogic.h @@ -64,6 +64,8 @@ #define CONFIG_SYS_DFU_MAX_FILE_SIZE SZ_2M #endif +#undef CONFIG_SYS_BOARD + #ifdef CONFIG_TIZEN_KHADAS_VIM3 #define TIZEN_BOOT_PREFIX "/kvim/ /" #define DFU_ALT_BOOT DFU_ALT_BOOT_VIM3