From mboxrd@z Thu Jan 1 00:00:00 1970 From: Minkyu Kang Date: Thu, 02 Oct 2014 10:59:10 +0900 Subject: [U-Boot] [PATCH v4 0/15] samsung: Use common config files with Samsung boards In-Reply-To: References: <1411953534-4652-1-git-send-email-sjg@chromium.org> <542AB489.5050504@samsung.com> Message-ID: <542CB16E.5030906@samsung.com> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: u-boot@lists.denx.de Hi, On 01/10/14 11:12, Simon Glass wrote: > Hi Minkyu, > > On 30 September 2014 07:47, Minkyu Kang wrote: >> Dear Simon Glass, >> >>> >> >> patch failed at latest u-boot-samsung tree. >> >> error: patch failed: include/configs/smdk5250.h:9 >> error: include/configs/smdk5250.h: patch does not apply >> error: patch failed: include/configs/snow.h:9 >> error: include/configs/snow.h: patch does not apply >> Patch failed at 0007 exynos: Rename -dt config files to -common >> >> Please check. > > The problem is the Kconfig patches which moved the CONFIG_OF options > to Kconfig from the board config/*.h files. > > If I rebase on samsung you are going to get conflicts when merging to mainline. > > So would it be better to sync up to mainline first? The main rule of samsung tree is to sync with arm tree. I tried to merge after sync with arm tree, but it also failed. So please wait until sync with mainline and arm tree. Thanks, Minkyu Kang.