From mboxrd@z Thu Jan 1 00:00:00 1970 From: Przemyslaw Marczak Date: Wed, 08 Jan 2014 14:47:44 +0100 Subject: [U-Boot] [PATCH v3 11/12] trats2: add LCD download menu support In-Reply-To: <52CCB037.9070900@samsung.com> References: <1388767393-16173-11-git-send-email-p.marczak@samsung.com> <1388769719-16064-1-git-send-email-p.marczak@samsung.com> <52CA9580.1030600@samsung.com> <52CBF8FC.2040906@samsung.com> <52CCB037.9070900@samsung.com> Message-ID: <52CD5700.70706@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 Hello Minkyu, On 01/08/2014 02:56 AM, Minkyu Kang wrote: > Dear Przemsyslaw Marczak, > > On 07/01/14 21:54, Przemyslaw Marczak wrote: >> Hello, >> >> On 01/06/2014 12:37 PM, Minkyu Kang wrote: >>> On 04/01/14 02:21, Przemyslaw Marczak wrote: >>>> Signed-off-by: Przemyslaw Marczak >>>> >>>> --- >>>> changes v2: >>>> - add definitions for check keys >>>> - cleanup config definitions >>>> >>>> Changes v3: >>>> - remove CONFIG_BOARD_NAME from include/configs/trats2.h >>>> >>>> include/configs/trats2.h | 26 ++++++++++++++++++++++++++ >>>> 1 file changed, 26 insertions(+) >>>> >>>> diff --git a/include/configs/trats2.h b/include/configs/trats2.h >>>> index 740ceb1..453a37e 100644 >>>> --- a/include/configs/trats2.h >>>> +++ b/include/configs/trats2.h >>>> @@ -19,6 +19,7 @@ >>>> #define CONFIG_S5P /* which is in a S5P Family */ >>>> #define CONFIG_EXYNOS4 /* which is in a EXYNOS4XXX */ >>>> #define CONFIG_TIZEN /* TIZEN lib */ >>>> +#define CONFIG_TRATS2 >>>> >>>> #include /* get chip and board defs */ >>>> >>>> @@ -315,6 +316,31 @@ int get_soft_i2c_sda_pin(void); >>>> /* Common misc for Samsung */ >>>> #define CONFIG_MISC_INIT_R >>>> >>>> +/* Download menu - Samsung common */ >>>> +#define CONFIG_LCD_MENU >>>> +#define CONFIG_LCD_MENU_BOARD >>>> + >>>> +/* Download menu - definitions for check keys */ >>>> +#ifndef __ASSEMBLY__ >>>> +#ifdef __COMMON_H_ >>> >>> why this ifdef(__COMMON_H_) is needed? >>> >> >> There was some include conflict with pmic which breaks build and this macro resolve it. > > What kind of conflict? > I think it is not a solution. > > Thanks, > Minkyu Kang. > There was various errors with conflicting declaration types. It was looking like "common.h" was not included for some file when I add include of pmic.h to file trats2.h. The conflict was because of max77686_pmic.h which needs pmic.h(functions declarations with struct pmic). File pmic.h includes common.h but it is unneeded there. Remove common.h from pmic.h solved this issue. I will resend patches soon. Thank you -- Przemyslaw Marczak Samsung R&D Institute Poland Samsung Electronics p.marczak at samsung.com