| Message ID | 1288985821-27497-3-git-send-email-notasas@gmail.com |
|---|---|
| State | Awaiting Upstream |
| Delegated to: | Sandeep Paulraj |
| Headers | show |
> > Pandora's config has various flash related macros that are either > not referenced anywhere in the code or are used by drivers that > are not enabled. Remove them. > > Signed-off-by: Grazvydas Ignotas <notasas@gmail.com> > --- > Alternatively this old patch can be applied to clean up more OMAP boards: > http://lists.denx.de/pipermail/u-boot/2010-April/070860.html Do you think this patch still applies clean? It will be better if you repost to refresh us all. Regards, Sandeep
> > On Fri, Nov 5, 2010 at 10:07 PM, Paulraj, Sandeep <s-paulraj@ti.com> > wrote: > > > >> > >> Pandora's config has various flash related macros that are either > >> not referenced anywhere in the code or are used by drivers that > >> are not enabled. Remove them. > >> > >> Signed-off-by: Grazvydas Ignotas <notasas@gmail.com> > >> --- > >> Alternatively this old patch can be applied to clean up more OMAP > boards: > >> http://lists.denx.de/pipermail/u-boot/2010-April/070860.html > > > > Do you think this patch still applies clean? > > > > It will be better if you repost to refresh us all. > > Yes it still does, attaching for your convenience (with Steve's ack > from June 9). This does not apply. This is probably because I added your other patches --Sandeep
On Fri, Nov 19, 2010 at 10:29 PM, Paulraj, Sandeep <s-paulraj@ti.com> wrote: >> On Fri, Nov 5, 2010 at 10:07 PM, Paulraj, Sandeep <s-paulraj@ti.com> >> wrote: >> > >> >> >> >> Pandora's config has various flash related macros that are either >> >> not referenced anywhere in the code or are used by drivers that >> >> are not enabled. Remove them. >> >> >> >> Signed-off-by: Grazvydas Ignotas <notasas@gmail.com> >> >> --- >> >> Alternatively this old patch can be applied to clean up more OMAP >> boards: >> >> http://lists.denx.de/pipermail/u-boot/2010-April/070860.html >> > >> > Do you think this patch still applies clean? >> > >> > It will be better if you repost to refresh us all. >> >> Yes it still does, attaching for your convenience (with Steve's ack >> from June 9). > > This does not apply. This is probably because I added your other patches Yeah this this was supposed to be applied instead of "OMAP3: pandora: remove unused config macros" (it covers pandora and other boards, you applied pandora-only version). I see my email got mangled in u-boot-ti.git, could you fix it up if you haven't sent pull request yet? You could replace this patch with 2/3 along the way too (can be done easily with git rebase -i).
Dear Sandeep, In message <AANLkTikYMeERp9JXSS71+4Uv+WD38zRkQcsV5bGK2Zfk@mail.gmail.com> Grazvydas Ignotas wrote: > > > This does not apply. This is probably because I added your other patches > > Yeah this this was supposed to be applied instead of "OMAP3: pandora: > remove unused config macros" (it covers pandora and other boards, you > applied pandora-only version). > > I see my email got mangled in u-boot-ti.git, could you fix it up if > you haven't sent pull request yet? You could replace this patch with > 2/3 along the way too (can be done easily with git rebase -i). I think Grazvydas is right on both accounts. I dropped the pull from the -ti repo again and suggest you do the changes as suggested by Grazvydas. Is this OK with you? Please send new pull request when you are ready. Best regards, Wolfgang Denk
> Dear Sandeep, > > In message <AANLkTikYMeERp9JXSS71+4Uv+WD38zRkQcsV5bGK2Zfk@mail.gmail.com> > Grazvydas Ignotas wrote: > > > > > This does not apply. This is probably because I added your other > patches > > > > Yeah this this was supposed to be applied instead of "OMAP3: pandora: > > remove unused config macros" (it covers pandora and other boards, you > > applied pandora-only version). > > > > I see my email got mangled in u-boot-ti.git, could you fix it up if > > you haven't sent pull request yet? You could replace this patch with > > 2/3 along the way too (can be done easily with git rebase -i). > > I think Grazvydas is right on both accounts. I dropped the pull from > the -ti repo again and suggest you do the changes as suggested by > Grazvydas. Is this OK with you? Yes not problem > > Please send new pull request when you are ready. I just did Regards, Sandeep
diff --git a/include/configs/omap3_pandora.h b/include/configs/omap3_pandora.h index b8cd2cd..f386bc4 100644 --- a/include/configs/omap3_pandora.h +++ b/include/configs/omap3_pandora.h @@ -261,40 +261,20 @@ #define PISMO1_NAND_SIZE GPMC_SIZE_128M #define PISMO1_ONEN_SIZE GPMC_SIZE_128M -#define CONFIG_SYS_MAX_FLASH_SECT 520 /* max number of sectors on */ - /* one chip */ -#define CONFIG_SYS_MAX_FLASH_BANKS 2 /* max number of flash banks */ #define CONFIG_SYS_MONITOR_LEN (256 << 10) /* Reserve 2 sectors */ #define CONFIG_SYS_FLASH_BASE boot_flash_base /* Monitor at start of flash */ #define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_FLASH_BASE -#define CONFIG_SYS_ONENAND_BASE ONENAND_MAP #define CONFIG_ENV_IS_IN_NAND 1 -#define ONENAND_ENV_OFFSET 0x240000 /* environment starts here */ #define SMNAND_ENV_OFFSET 0x240000 /* environment starts here */ #define CONFIG_SYS_ENV_SECT_SIZE boot_flash_sec #define CONFIG_ENV_OFFSET boot_flash_off #define CONFIG_ENV_ADDR SMNAND_ENV_OFFSET -/*----------------------------------------------------------------------- - * CFI FLASH driver setup - */ -/* timeout values are in ticks */ -#define CONFIG_SYS_FLASH_ERASE_TOUT (100 * CONFIG_SYS_HZ) -#define CONFIG_SYS_FLASH_WRITE_TOUT (100 * CONFIG_SYS_HZ) - -/* Flash banks JFFS2 should use */ -#define CONFIG_SYS_MAX_MTD_BANKS (CONFIG_SYS_MAX_FLASH_BANKS + \ - CONFIG_SYS_MAX_NAND_DEVICE) -#define CONFIG_SYS_JFFS2_MEM_NAND -/* use flash_info[2] */ -#define CONFIG_SYS_JFFS2_FIRST_BANK CONFIG_SYS_MAX_FLASH_BANKS -#define CONFIG_SYS_JFFS2_NUM_BANKS 1 - #ifndef __ASSEMBLY__ extern unsigned int boot_flash_base; extern volatile unsigned int boot_flash_env_addr;
Pandora's config has various flash related macros that are either not referenced anywhere in the code or are used by drivers that are not enabled. Remove them. Signed-off-by: Grazvydas Ignotas <notasas@gmail.com> --- Alternatively this old patch can be applied to clean up more OMAP boards: http://lists.denx.de/pipermail/u-boot/2010-April/070860.html include/configs/omap3_pandora.h | 20 -------------------- 1 files changed, 0 insertions(+), 20 deletions(-)