From: Simon Goldschmidt Date: Thu, 21 Mar 2019 20:58:40 +0100 Subject: [U-Boot] [PATCHv2 2/2] configs: move CONFIG_SPL_TEXT_BASE to Kconfig In-Reply-To: <1552994078-2697-2-git-send-email-trini@konsulko.com> References: <1552994078-2697-1-git-send-email-trini@konsulko.com> <1552994078-2697-2-git-send-email-trini@konsulko.com> Message-ID: List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: u-boot@lists.denx.de Hi Tom, Am 19.03.2019 um 12:14 schrieb Tom Rini: > From: Simon Goldschmidt > > Moved CONFIG_SPL_TEXT_BASE to common/spl/Kconfig and migrate existing > values. > > Signed-off-by: Simon Goldschmidt > [trini: Re-run migration] > Signed-off-by: Tom Rini Unfortunately, this clashes with Marek's last pull-request, where socfpga_common.h has changed in this exact area. However, after manually fixing this merge conflict, everything works fine (tested on socfpga_socrates). Regards, Simon