| Message ID | 1388769719-16064-1-git-send-email-p.marczak@samsung.com |
|---|---|
| State | Changes Requested |
| Delegated to: | Minkyu Kang |
| Headers | show |
On 04/01/14 02:21, Przemyslaw Marczak wrote: > Signed-off-by: Przemyslaw Marczak <p.marczak@samsung.com> > > --- > 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 <asm/arch/cpu.h> /* 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? > +#include <power/pmic.h> > +#include <power/max77686_pmic.h> > + > +#define KEY_PWR_PMIC_NAME "MAX77686_PMIC" > +#define KEY_PWR_STATUS_REG MAX77686_REG_PMIC_STATUS1 > +#define KEY_PWR_STATUS_MASK (1 << 0) > +#define KEY_PWR_INTERRUPT_REG MAX77686_REG_PMIC_INT1 > +#define KEY_PWR_INTERRUPT_MASK (1 << 1) > + > +#define KEY_VOL_UP_GPIO exynos4x12_gpio_get(2, x2, 2) > +#define KEY_VOL_DOWN_GPIO exynos4x12_gpio_get(2, x3, 3) > +#endif /* __COMMON_H_ */ > +#endif /* __ASSEMBLY__ */ > + > +/* LCD console */ > +#define LCD_BPP LCD_COLOR16 > +#define CONFIG_SYS_WHITE_ON_BLACK > + > /* LCD */ > #define CONFIG_EXYNOS_FB > #define CONFIG_LCD > Thanks, Minkyu Kang.
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 <p.marczak@samsung.com> >> >> --- >> 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 <asm/arch/cpu.h> /* 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. >> +#include <power/pmic.h> >> +#include <power/max77686_pmic.h> >> + >> +#define KEY_PWR_PMIC_NAME "MAX77686_PMIC" >> +#define KEY_PWR_STATUS_REG MAX77686_REG_PMIC_STATUS1 >> +#define KEY_PWR_STATUS_MASK (1 << 0) >> +#define KEY_PWR_INTERRUPT_REG MAX77686_REG_PMIC_INT1 >> +#define KEY_PWR_INTERRUPT_MASK (1 << 1) >> + >> +#define KEY_VOL_UP_GPIO exynos4x12_gpio_get(2, x2, 2) >> +#define KEY_VOL_DOWN_GPIO exynos4x12_gpio_get(2, x3, 3) >> +#endif /* __COMMON_H_ */ >> +#endif /* __ASSEMBLY__ */ >> + >> +/* LCD console */ >> +#define LCD_BPP LCD_COLOR16 >> +#define CONFIG_SYS_WHITE_ON_BLACK >> + >> /* LCD */ >> #define CONFIG_EXYNOS_FB >> #define CONFIG_LCD >> > > Thanks, > Minkyu Kang. > Regards
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 <p.marczak@samsung.com> >>> >>> --- >>> 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 <asm/arch/cpu.h> /* 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.
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 <p.marczak@samsung.com> >>>> >>>> --- >>>> 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 <asm/arch/cpu.h> /* 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
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 <asm/arch/cpu.h> /* 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_ +#include <power/pmic.h> +#include <power/max77686_pmic.h> + +#define KEY_PWR_PMIC_NAME "MAX77686_PMIC" +#define KEY_PWR_STATUS_REG MAX77686_REG_PMIC_STATUS1 +#define KEY_PWR_STATUS_MASK (1 << 0) +#define KEY_PWR_INTERRUPT_REG MAX77686_REG_PMIC_INT1 +#define KEY_PWR_INTERRUPT_MASK (1 << 1) + +#define KEY_VOL_UP_GPIO exynos4x12_gpio_get(2, x2, 2) +#define KEY_VOL_DOWN_GPIO exynos4x12_gpio_get(2, x3, 3) +#endif /* __COMMON_H_ */ +#endif /* __ASSEMBLY__ */ + +/* LCD console */ +#define LCD_BPP LCD_COLOR16 +#define CONFIG_SYS_WHITE_ON_BLACK + /* LCD */ #define CONFIG_EXYNOS_FB #define CONFIG_LCD
Signed-off-by: Przemyslaw Marczak <p.marczak@samsung.com> --- 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(+)