ppc4xx: Adjust environment size on neo
PATCH 1/8 ppc4xx: Adjust environment size on neo
Environment size on neo has to be 0x20000 for compatibilty reasons.
--- include/configs/neo.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
include/configs/neo.h +1 -1
@@ -150,7 +150,7 @@#ifdef CONFIG_ENV_IS_IN_FLASH #define CONFIG_ENV_SECT_SIZE 0x20000/* size of one complete sector */ #define CONFIG_ENV_ADDR ((-CONFIG_SYS_MONITOR_LEN)-CONFIG_ENV_SECT_SIZE) -#define CONFIG_ENV_SIZE 0x2000/* Total Size of Environment Sector */ +#define CONFIG_ENV_SIZE 0x20000/* Total Size of Environment Sector */ /* Address and size of Redundant Environment Sector */ #define CONFIG_ENV_ADDR_REDUND (CONFIG_ENV_ADDR-CONFIG_ENV_SECT_SIZE)
Signature · 1 line
1.7.2.5
PATCH 2/8 ppc4xx: Make gdsys 405ep boards reset more generic
In order to add boards that have different hardware for fpga reset, any 405ep gdsys board now provides these functions:
void gd405ep_init(void);
void gd405ep_set_fpga_reset(unsigned state);
void gd405ep_setup_hw(void);
int gd405ep_get_fpga_done(unsigned fpga);
--- board/gdsys/405ep/405ep.c | 42 +++++------ board/gdsys/405ep/405ep.h | 10 +++ board/gdsys/405ep/Makefile | 1 + board/gdsys/405ep/dlvision-10g.c | 36 ++++++++- board/gdsys/405ep/io.c | 34 ++++++++ board/gdsys/405ep/iocon.c | 34 ++++++++ board/gdsys/405ep/neo.c | 161 ++++++++++++++++++++++++++++++++++++++ board/gdsys/neo/Makefile | 45 ----------- board/gdsys/neo/neo.c | 102 ------------------------ boards.cfg | 2 +- include/configs/dlvision-10g.h | 3 +- include/configs/io.h | 5 +- include/configs/iocon.h | 3 +- include/configs/neo.h | 94 +++++++++++++---------- include/gdsys_fpga.h | 11 +++ 15 files changed, 366 insertions(+), 217 deletions(-) create mode 100644 board/gdsys/405ep/405ep.h create mode 100644 board/gdsys/405ep/neo.c delete mode 100644 board/gdsys/neo/Makefile delete mode 100644 board/gdsys/neo/neo.c
board/gdsys/405ep/405ep.c +19 -23
@@ -28,12 +28,9 @@#include <asm/ppc4xx-gpio.h> #include <asm/global_data.h> +#include "405ep.h" #include <gdsys_fpga.h> -#define LATCH0_BASE (CONFIG_SYS_LATCH_BASE) -#define LATCH1_BASE (CONFIG_SYS_LATCH_BASE + 0x100) -#define LATCH2_BASE (CONFIG_SYS_LATCH_BASE + 0x200) -#define REFLECTION_TESTPATTERN 0xdede#define REFLECTION_TESTPATTERN_INV (~REFLECTION_TESTPATTERN & 0xffff)
@@ -55,7 +52,6 @@ void print_fpga_state(unsigned dev)int board_early_init_f (void ) {unsigned k; -unsigned ctr;for (k =0 ; k <CONFIG_SYS_FPGA_COUNT ; ++k) gd->fpga_state[k] =0 ;
@@ -73,26 +69,29 @@ int board_early_init_f(void)* -> ca. 15 us */ mtebc (EBC0_CFG ,0xa8400000 );/* ebc always driven */ +return 0 ; +} -/* -* setup io-latches for reset -*/ -out_le16 ((void *)LATCH0_BASE ,CONFIG_SYS_LATCH0_RESET ); -out_le16 ((void *)LATCH1_BASE ,CONFIG_SYS_LATCH1_RESET ); +int board_early_init_r (void ) +{ +unsigned k; +unsigned ctr; -/* -* set "startup-finished"-gpios -*/ -gpio_write_bit (21 ,0 ); -gpio_write_bit (22 ,1 ); +for (k =0 ; k <CONFIG_SYS_FPGA_COUNT ; ++k) + gd->fpga_state[k] =0 ;/* -* wait for fpga-done +* reset FPGA */ +gd405ep_init (); + +gd405ep_set_fpga_reset (1 ); + +gd405ep_setup_hw (); +for (k =0 ; k <CONFIG_SYS_FPGA_COUNT ; ++k) { ctr =0 ; -while (!(in_le16 ((void *)LATCH2_BASE ) - &CONFIG_SYS_FPGA_DONE (k))) { +while (!gd405ep_get_fpga_done (k)) {udelay (100000 );if (ctr++ >5 ) { gd->fpga_state[k] |=FPGA_STATE_DONE_FAILED ;
@@ -101,12 +100,9 @@ int board_early_init_f(void) } } -/* -* setup io-latches for boot (stop reset) -*/ udelay (10 ); -out_le16 ((void *)LATCH0_BASE ,CONFIG_SYS_LATCH0_BOOT ); -out_le16 ((void *)LATCH1_BASE ,CONFIG_SYS_LATCH1_BOOT ); + +gd405ep_set_fpga_reset (0 );for (k =0 ; k <CONFIG_SYS_FPGA_COUNT ; ++k) {ihs_fpga_t *fpga = (ihs_fpga_t *)CONFIG_SYS_FPGA_BASE (k);
board/gdsys/405ep/405ep.h new file +10 -0
@@ -0,0 +1,10 @@ +#ifndef __405EP_H_ +#define __405EP_H_ + +/* functions to be provided by board implementation */ +void gd405ep_init (void ); +void gd405ep_set_fpga_reset (unsigned state); +void gd405ep_setup_hw (void ); +int gd405ep_get_fpga_done (unsigned fpga); + +#endif /* __405EP_H_ */
board/gdsys/405ep/Makefile +1 -0
@@ -25,6 +25,7 @@ include $(TOPDIR)/config.mk LIB = $(obj)lib$(BOARD).o +COBJS-$(CONFIG_NEO) += neo.o COBJS-$(CONFIG_IO) += io.o COBJS-$(CONFIG_IOCON) += iocon.o COBJS-$(CONFIG_DLVISION_10G) += dlvision-10g.o
board/gdsys/405ep/dlvision-10g.c +34 -2
@@ -27,15 +27,18 @@#include <asm/io.h> #include <asm/ppc4xx-gpio.h> +#include "405ep.h" #include <gdsys_fpga.h> #include "../common/osd.h" +#define LATCH0_BASE (CONFIG_SYS_LATCH_BASE) +#define LATCH1_BASE (CONFIG_SYS_LATCH_BASE + 0x100)#define LATCH2_BASE (CONFIG_SYS_LATCH_BASE + 0x200) -#define LATCH2_MC2_PRESENT_N 0x0080 -#define LATCH3_BASE (CONFIG_SYS_LATCH_BASE + 0x300) +#define LATCH2_MC2_PRESENT_N 0x0080 +enum {UNITTYPE_VIDEO_USER =0 ,UNITTYPE_MAIN_USER =1 ,
@@ -261,3 +264,32 @@ int last_stage_init(void)return 0 ; } + +void gd405ep_init (void ) +{ +} + +void gd405ep_set_fpga_reset (unsigned state) +{ +if (state) { +out_le16 ((void *)LATCH0_BASE ,CONFIG_SYS_LATCH0_RESET ); +out_le16 ((void *)LATCH1_BASE ,CONFIG_SYS_LATCH1_RESET ); + }else { +out_le16 ((void *)LATCH0_BASE ,CONFIG_SYS_LATCH0_BOOT ); +out_le16 ((void *)LATCH1_BASE ,CONFIG_SYS_LATCH1_BOOT ); + } +} + +void gd405ep_setup_hw (void ) +{ +/* +* set "startup-finished"-gpios +*/ +gpio_write_bit (21 ,0 ); +gpio_write_bit (22 ,1 ); +} + +int gd405ep_get_fpga_done (unsigned fpga) +{ +return in_le16 ((void *)LATCH2_BASE ) &CONFIG_SYS_FPGA_DONE (fpga); +}
board/gdsys/405ep/io.c +34 -0
@@ -29,8 +29,13 @@#include <miiphy.h> +#include "405ep.h" #include <gdsys_fpga.h> +#define LATCH0_BASE (CONFIG_SYS_LATCH_BASE) +#define LATCH1_BASE (CONFIG_SYS_LATCH_BASE + 0x100) +#define LATCH2_BASE (CONFIG_SYS_LATCH_BASE + 0x200) +#define PHYREG_CONTROL 0#define PHYREG_PAGE_ADDRESS 22#define PHYREG_PG0_COPPER_SPECIFIC_CONTROL_1 16
@@ -175,3 +180,32 @@ int last_stage_init(void)return 0 ; } + +void gd405ep_init (void ) +{ +} + +void gd405ep_set_fpga_reset (unsigned state) +{ +if (state) { +out_le16 ((void *)LATCH0_BASE ,CONFIG_SYS_LATCH0_RESET ); +out_le16 ((void *)LATCH1_BASE ,CONFIG_SYS_LATCH1_RESET ); + }else { +out_le16 ((void *)LATCH0_BASE ,CONFIG_SYS_LATCH0_BOOT ); +out_le16 ((void *)LATCH1_BASE ,CONFIG_SYS_LATCH1_BOOT ); + } +} + +void gd405ep_setup_hw (void ) +{ +/* +* set "startup-finished"-gpios +*/ +gpio_write_bit (21 ,0 ); +gpio_write_bit (22 ,1 ); +} + +int gd405ep_get_fpga_done (unsigned fpga) +{ +return in_le16 ((void *)LATCH2_BASE ) &CONFIG_SYS_FPGA_DONE (fpga); +}
board/gdsys/405ep/iocon.c +34 -0
@@ -27,10 +27,15 @@#include <asm/io.h> #include <asm/ppc4xx-gpio.h> +#include "405ep.h" #include <gdsys_fpga.h> #include "../common/osd.h" +#define LATCH0_BASE (CONFIG_SYS_LATCH_BASE) +#define LATCH1_BASE (CONFIG_SYS_LATCH_BASE + 0x100) +#define LATCH2_BASE (CONFIG_SYS_LATCH_BASE + 0x200) +enum {UNITTYPE_MAIN_SERVER =0 ,UNITTYPE_MAIN_USER =1 ,
@@ -231,3 +236,32 @@ int fpga_gpio_get(int pin) {return in_le16 ((void *)(CONFIG_SYS_FPGA0_BASE +0x14 )) & pin; } + +void gd405ep_init (void ) +{ +} + +void gd405ep_set_fpga_reset (unsigned state) +{ +if (state) { +out_le16 ((void *)LATCH0_BASE ,CONFIG_SYS_LATCH0_RESET ); +out_le16 ((void *)LATCH1_BASE ,CONFIG_SYS_LATCH1_RESET ); + }else { +out_le16 ((void *)LATCH0_BASE ,CONFIG_SYS_LATCH0_BOOT ); +out_le16 ((void *)LATCH1_BASE ,CONFIG_SYS_LATCH1_BOOT ); + } +} + +void gd405ep_setup_hw (void ) +{ +/* +* set "startup-finished"-gpios +*/ +gpio_write_bit (21 ,0 ); +gpio_write_bit (22 ,1 ); +} + +int gd405ep_get_fpga_done (unsigned fpga) +{ +return in_le16 ((void *)LATCH2_BASE ) &CONFIG_SYS_FPGA_DONE (fpga); +}
board/gdsys/405ep/neo.c new file +161 -0
161 lines not on this page · raw message
board/gdsys/neo/Makefile deleted +0 -45
45 lines not on this page · raw message
board/gdsys/neo/neo.c deleted +0 -102
102 lines not on this page · raw message
boards.cfg +1 -1
@@ -982,7 +982,7 @@ intip powerpc ppc4xx intip gdsys io powerpc ppc4xx 405ep gdsys io64 powerpc ppc4xx 405ex gdsys iocon powerpc ppc4xx 405ep gdsys -neo powerpc ppc4xx - gdsys +neo powerpc ppc4xx 405ep gdsys icon powerpc ppc4xx - mosaixtech MIP405 powerpc ppc4xx mip405 mpl MIP405T powerpc ppc4xx mip405 mpl - MIP405:MIP405T
include/configs/dlvision-10g.h +2 -1
@@ -37,7 +37,8 @@#define CONFIG_IDENT_STRING " dlvision-10g 0.02"#include "amcc-common.h" -#define CONFIG_BOARD_EARLY_INIT_F /* call board_early_init_f */ +#define CONFIG_BOARD_EARLY_INIT_F +#define CONFIG_BOARD_EARLY_INIT_R #define CONFIG_LAST_STAGE_INIT #define CONFIG_SYS_CLK_FREQ 33333333/* external frequency to pll */
include/configs/io.h +3 -2
@@ -37,8 +37,9 @@#define CONFIG_IDENT_STRING " io 0.04"#include "amcc-common.h" -#define CONFIG_BOARD_EARLY_INIT_F /* call board_early_init_f */ -#define CONFIG_LAST_STAGE_INIT /* call last_stage_init */ +#define CONFIG_BOARD_EARLY_INIT_F +#define CONFIG_BOARD_EARLY_INIT_R +#define CONFIG_LAST_STAGE_INIT #define CONFIG_SYS_CLK_FREQ 33333333/* external frequency to pll */
include/configs/iocon.h +2 -1
@@ -37,7 +37,8 @@#define CONFIG_IDENT_STRING " iocon 0.03"#include "amcc-common.h" -#define CONFIG_BOARD_EARLY_INIT_F /* call board_early_init_f */ +#define CONFIG_BOARD_EARLY_INIT_F +#define CONFIG_BOARD_EARLY_INIT_R #define CONFIG_LAST_STAGE_INIT #define CONFIG_SYS_CLK_FREQ 33333333/* external frequency to pll */
include/configs/neo.h +54 -40
128 lines not on this page · raw message
include/gdsys_fpga.h +11 -0
@@ -58,6 +58,17 @@ typedef struct ihs_osd {u16 y_pos; } ihs_osd_t; +#ifdef CONFIG_NEO +typedef struct ihs_fpga { +u16 reflection_low;/* 0x0000 */ +u16 versions;/* 0x0002 */ +u16 fpga_features;/* 0x0004 */ +u16 fpga_version;/* 0x0006 */ +u16 reserved_0[8187 ];/* 0x0008 */ +u16 reflection_high;/* 0x3ffe */ +}ihs_fpga_t ; +#endif + #ifdef CONFIG_IO typedef struct ihs_fpga { u16 reflection_low; /* 0x0000 */
Signature · 1 line
1.7.2.5
PATCH 3/8 powerpc: Adapt gdsys 405ep boards to platform changes
In reply to Dirk EibachPrint fpga info at last_stage_init on gdsys 405ep boards. Use dtt_init() to startup fans.
--- board/gdsys/405ep/dlvision-10g.c | 28 ++++++++++++++++--------- board/gdsys/405ep/io.c | 41 +++++++++++++++++++++++++------------ board/gdsys/405ep/iocon.c | 34 ++++++++++++++++++------------- include/configs/dlvision-10g.h | 2 + include/configs/io.h | 2 + 5 files changed, 70 insertions(+), 37 deletions(-)
board/gdsys/405ep/dlvision-10g.c +18 -10
@@ -26,6 +26,7 @@#include <asm/processor.h> #include <asm/io.h> #include <asm/ppc4xx-gpio.h> +#include <dtt.h> #include "405ep.h" #include <gdsys_fpga.h>
@@ -68,6 +69,14 @@ enum { RAM_DDR2_64 = 2, }; +int misc_init_r (void ) +{ +/* startup fans */ +dtt_init (); + +return 0 ; +} +static unsigned int get_hwver (void ) {u16 latch3 =in_le16 ((void *)LATCH3_BASE );
@@ -226,24 +235,19 @@ static void print_fpga_info(unsigned dev)*/ int checkboard (void ) { -char buf[64 ]; -int i =getenv_f ("serial#" , buf,sizeof (buf)); +char *s =getenv ("serial#" ); -printf ("Board: " ); +puts ("Board: " ); -printf ("DLVision 10G" ); +puts ("DLVision 10G" ); -if (i >0 ) { +if (s !=NULL ) {puts (", serial# " ); -puts (buf); +puts (s); }puts ("\n" ); -print_fpga_info (0 ); -if (get_mc2_present ()) -print_fpga_info (1 ); -return 0 ; }
@@ -252,6 +256,10 @@ int last_stage_init(void)ihs_fpga_t *fpga = (ihs_fpga_t *)CONFIG_SYS_FPGA_BASE (0 );u16 versions =in_le16 (&fpga->versions); +print_fpga_info (0 ); +if (get_mc2_present ()) +print_fpga_info (1 ); +if (((versions >>4 ) &0x000f ) !=UNITTYPE_MAIN_USER )return 0 ;
board/gdsys/405ep/io.c +28 -13
77 lines not on this page · raw message
board/gdsys/405ep/iocon.c +20 -14
@@ -74,8 +74,24 @@ enum {*/ int checkboard (void ) { -char buf[64 ]; -int i =getenv_f ("serial#" , buf,sizeof (buf)); +char *s =getenv ("serial#" ); + +puts ("Board: " ); + +puts ("IoCon" ); + +if (s !=NULL ) { +puts (", serial# " ); +puts (s); + } + +puts ("\n" ); + +return 0 ; +} + +static void print_fpga_info (void ) +{ihs_fpga_t *fpga = (ihs_fpga_t *)CONFIG_SYS_FPGA_BASE (0 );u16 versions =in_le16 (&fpga->versions);u16 fpga_version =in_le16 (&fpga->fpga_version);
@@ -100,16 +116,6 @@ int checkboard(void) feature_carriers = (fpga_features &0x000c ) >>2 ; feature_video_channels = fpga_features &0x0003 ; -printf ("Board: " ); - -printf ("IoCon" ); - -if (i >0 ) { -puts (", serial# " ); -puts (buf); - } -puts ("\n " ); -switch (unit_type) {case UNITTYPE_MAIN_USER :printf ("Mainchannel" );
@@ -210,12 +216,12 @@ int checkboard(void)printf (", %d carrier(s)" , feature_carriers);printf (", %d video channel(s)\n" , feature_video_channels); - -return 0 ; }int last_stage_init (void ) { +print_fpga_info (); +return osd_probe (0 ); }
include/configs/dlvision-10g.h +2 -0
@@ -39,6 +39,7 @@#define CONFIG_BOARD_EARLY_INIT_F #define CONFIG_BOARD_EARLY_INIT_R +#define CONFIG_MISC_INIT_R #define CONFIG_LAST_STAGE_INIT #define CONFIG_SYS_CLK_FREQ 33333333/* external frequency to pll */
@@ -81,6 +82,7 @@* Commands additional to the ones defined in amcc-common.h */ #define CONFIG_CMD_CACHE +#define CONFIG_CMD_DTT #undef CONFIG_CMD_EEPROM/*
include/configs/io.h +2 -0
@@ -39,6 +39,7 @@#define CONFIG_BOARD_EARLY_INIT_F #define CONFIG_BOARD_EARLY_INIT_R +#define CONFIG_MISC_INIT_R #define CONFIG_LAST_STAGE_INIT #define CONFIG_SYS_CLK_FREQ 33333333/* external frequency to pll */
@@ -77,6 +78,7 @@* Commands additional to the ones defined in amcc-common.h */ #define CONFIG_CMD_CACHE +#define CONFIG_CMD_DTT #undef CONFIG_CMD_EEPROM/*
Signature · 1 line
1.7.2.5
PATCH 3/8 powerpc: Adapt gdsys 405ep boards to platform changes
Hi Dirk,
Quoted 2 lines · On Thursday 26 April 2012 13:49:31 Dirk Eibach wrote:
Print fpga info at
last_stage_initon gdsys 405ep boards. Usedtt_init()to startup fans.
Your patchset is not organized optimally. You sent 8 patches in one patchset, from a quick glance 6 patches are ppc4xx related (4xx board changes), one is mpc85xx related and one is a general patch. I suggest that you move the ppc4xx patches into one patchset and exclude the other 2 patches from it and send them separately.
And please always put the responsible custodian on Cc.
I'll review the 4xx patches, once you resend them.
Thanks,
Stefan
--
DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-0 Fax: (+49)-8142-66989-80 Email: office at denx.de
PATCH 4/8 powerpc: Support gdsys dlvision-10g hardware 1.20
In reply to Dirk EibachIn hardware revision 1.20 one more fan controller is added to dlvision-10g.
--- board/gdsys/405ep/dlvision-10g.c | 12 +++++++++++- include/configs/dlvision-10g.h | 4 ++-- 2 files changed, 13 insertions(+), 3 deletions(-)
board/gdsys/405ep/dlvision-10g.c +11 -1
@@ -50,6 +50,8 @@ enum {enum {HWVER_101 =0 ,HWVER_110 =1 , +HWVER_120 =2 , +HWVER_130 =3 , };enum {
@@ -158,7 +160,15 @@ static void print_fpga_info(unsigned dev)break ;case HWVER_110 : -printf (" HW-Ver 1.10\n" ); +printf (" HW-Ver 1.10-1.12\n" ); +break ; + +case HWVER_120 : +printf (" HW-Ver 1.20\n" ); +break ; + +case HWVER_130 : +printf (" HW-Ver 1.30\n" );break ;default :
include/configs/dlvision-10g.h +2 -2
@@ -34,7 +34,7 @@* Include common defines/options for all AMCC eval boards */ #define CONFIG_HOSTNAME dlvsion-10g -#define CONFIG_IDENT_STRING " dlvision-10g 0.02" +#define CONFIG_IDENT_STRING " dlvision-10g 0.03"#include "amcc-common.h" #define CONFIG_BOARD_EARLY_INIT_F
@@ -118,7 +118,7 @@/* Temp sensor/hwmon/dtt */ #define CONFIG_DTT_LM63 1/* National LM63 */ -#define CONFIG_DTT_SENSORS { 0x4c, 0x4e }/* Sensor addresses */ +#define CONFIG_DTT_SENSORS { 0x4c, 0x4e, 0x18 }/* Sensor addresses */ #define CONFIG_DTT_PWM_LOOKUPTABLE \ { { 46, 10 }, { 48, 14 }, { 50, 19 }, { 52, 23 },\ { 54, 27 }, { 56, 31 }, { 58, 36 }, { 60, 40 } }
Signature · 1 line
1.7.2.5
PATCH 5/8 Consider CONFIG_ZERO_BOOTDELAY_CHECK when CONFIG_AUTOBOOT_KEYED is set
In reply to Dirk EibachWhen CONFIG_ZERO_BOOTDELAY_CHECK is not defined, bootdelay==0 prevents the check for console input (as stated in README.autoboot). This must also work in CONFIG_AUTOBOOT_KEYED mode.
--- common/main.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-)
common/main.c +5 -0
@@ -113,6 +113,11 @@ int abortboot(int bootdelay)u_int presskey_max =0 ;u_int i; +#ifndef CONFIG_ZERO_BOOTDELAY_CHECK +if (bootdelay ==0 ) +return 0 ; +#endif +# ifdef CONFIG_AUTOBOOT_PROMPT printf (CONFIG_AUTOBOOT_PROMPT );# endif
Signature · 1 line
1.7.2.5
PATCH 6/8 powerpc: Update gdsys board configurations
In reply to Dirk Eibach--- include/configs/gdppc440etx.h | 4 ++++ include/configs/intip.h | 4 ++-- include/configs/io.h | 6 +++++- include/configs/io64.h | 2 +- include/configs/iocon.h | 6 +++++- 5 files changed, 17 insertions(+), 5 deletions(-)
include/configs/gdppc440etx.h +4 -0
@@ -50,6 +50,10 @@#define CONFIG_BOARD_EARLY_INIT_F 1/* call board_early_init_f*/ #define CONFIG_MISC_INIT_R 1/* call misc_init_r() */ +#undef CONFIG_ZERO_BOOTDELAY_CHECK/* ignore keypress on bootdelay==0 */ +#define CONFIG_AUTOBOOT_KEYED /* use key strings to stop autoboot */ +#define CONFIG_AUTOBOOT_STOP_STR " " +/* * Base addresses -- Note these are effective addresses where the * actual resources get mapped (not physical addresses)
include/configs/intip.h +2 -2
@@ -37,10 +37,10 @@#define CONFIG_460EX 1/* Specific PPC460EX */ #ifdef CONFIG_DEVCONCENTER #define CONFIG_HOSTNAME devconcenter -#define CONFIG_IDENT_STRING " devconcenter 0.05" +#define CONFIG_IDENT_STRING " devconcenter 0.06"#else #define CONFIG_HOSTNAME intip -#define CONFIG_IDENT_STRING " intip 0.05" +#define CONFIG_IDENT_STRING " intip 0.06"#endif #define CONFIG_440 1#define CONFIG_4xx 1/* ... PPC4xx family */
include/configs/io.h +5 -1
@@ -34,7 +34,7 @@* Include common defines/options for all AMCC eval boards */ #define CONFIG_HOSTNAME io -#define CONFIG_IDENT_STRING " io 0.04" +#define CONFIG_IDENT_STRING " io 0.05"#include "amcc-common.h" #define CONFIG_BOARD_EARLY_INIT_F
@@ -50,6 +50,10 @@#define PLLMR0_DEFAULT PLLMR0_266_133_66#define PLLMR1_DEFAULT PLLMR1_266_133_66 +#undef CONFIG_ZERO_BOOTDELAY_CHECK/* ignore keypress on bootdelay==0 */ +#define CONFIG_AUTOBOOT_KEYED /* use key strings to stop autoboot */ +#define CONFIG_AUTOBOOT_STOP_STR " " +/* new uImage format support */ #define CONFIG_FIT #define CONFIG_FIT_VERBOSE /* enable fit_format_{error,warning}() */
include/configs/io64.h +1 -1
@@ -53,7 +53,7 @@* Include common defines/options for all AMCC eval boards */ #define CONFIG_HOSTNAME io64 -#define CONFIG_IDENT_STRING " io64 0.01" +#define CONFIG_IDENT_STRING " io64 0.02"#include "amcc-common.h" #define CONFIG_BOARD_EARLY_INIT_F
include/configs/iocon.h +5 -1
@@ -34,7 +34,7 @@* Include common defines/options for all AMCC eval boards */ #define CONFIG_HOSTNAME iocon -#define CONFIG_IDENT_STRING " iocon 0.03" +#define CONFIG_IDENT_STRING " iocon 0.04"#include "amcc-common.h" #define CONFIG_BOARD_EARLY_INIT_F
@@ -49,6 +49,10 @@#define PLLMR0_DEFAULT PLLMR0_266_133_66#define PLLMR1_DEFAULT PLLMR1_266_133_66 +#undef CONFIG_ZERO_BOOTDELAY_CHECK/* ignore keypress on bootdelay==0 */ +#define CONFIG_AUTOBOOT_KEYED /* use key strings to stop autoboot */ +#define CONFIG_AUTOBOOT_STOP_STR " " +/* new uImage format support */ #define CONFIG_FIT #define CONFIG_FIT_VERBOSE /* enable fit_format_{error,warning}() */
Signature · 1 line
1.7.2.5
PATCH 7/8 powerpc: Fix typo in gdsys_fpga.h
In reply to Dirk Eibach--- include/gdsys_fpga.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
include/gdsys_fpga.h +1 -1
@@ -115,7 +115,7 @@ typedef struct ihs_fpga {u16 reserved_2[93 ];/* 0x0044 */ u16 reflection_high;/* 0x00fe */ ihs_osd_t osd;/* 0x0100 */ -u16 reserved_3[88 ];/* 0x010e */ +u16 reserved_3[889 ];/* 0x010e */ u16 videomem; /* 0x0800 */ } ihs_fpga_t;#endif
Signature · 1 line
1.7.2.5
PATCH 8/8 powerpc: Add sdcard and spi boot support to P1022DS
In reply to Dirk Eibach--- board/freescale/p1022ds/p1022ds.c | 4 ++ board/freescale/p1022ds/tlb.c | 10 ++++++ boards.cfg | 4 ++ include/configs/P1022DS.h | 63 ++++++++++++++++++++++++++++++++++--- 4 files changed, 76 insertions(+), 5 deletions(-)
board/freescale/p1022ds/p1022ds.c +4 -0
@@ -37,6 +37,10 @@ int board_early_init_f(void) {ccsr_gur_t *gur = (void *)CONFIG_SYS_MPC85xx_GUTS_ADDR; +/* Reset eLBC_DIU and SPI_eLBC in case we are booting from SD */ +clrbits_be32 (&gur->pmuxcr,0x00600000 ); +setbits_be32 (&gur->pmuxcr,0x80000000 ); +/* Set pmuxcr to allow both i2c1 and i2c2 */ setbits_be32 (&gur->pmuxcr,0x1000 );
board/freescale/p1022ds/tlb.c +10 -0
@@ -71,6 +71,16 @@ struct fsl_e_tlb_entry tlb_table[] = { SET_TLB_ENTRY(1, PIXIS_BASE, PIXIS_BASE_PHYS, MAS3_SX|MAS3_SW|MAS3_SR, MAS2_I|MAS2_G, 0, 7, BOOKE_PAGESZ_4K, 1), + +#if defined(CONFIG_SYS_RAMBOOT ) +SET_TLB_ENTRY (1 ,CONFIG_SYS_DDR_SDRAM_BASE ,CONFIG_SYS_DDR_SDRAM_BASE , +MAS3_SX |MAS3_SW |MAS3_SR ,0 , +0 ,8 ,BOOKE_PAGESZ_1G ,1 ), +SET_TLB_ENTRY (1 ,CONFIG_SYS_DDR_SDRAM_BASE +0x40000000 , +CONFIG_SYS_DDR_SDRAM_BASE +0x40000000 , +MAS3_SX |MAS3_SW |MAS3_SR ,0 , + 0, 9, BOOKE_PAGESZ_1G, 1) +#endif };int num_tlb_entries =ARRAY_SIZE (tlb_table);
boards.cfg +4 -0
@@ -700,6 +700,10 @@ P1021RDB-PC_SDCARD powerpc mpc85xx p1_p2_rdb_pc freesca P1021RDB-PC_SPIFLASH powerpc mpc85xx p1_p2_rdb_pc freescale - p1_p2_rdb_pc:P1021RDB,SPIFLASH P1022DS powerpc mpc85xx p1022ds freescale P1022DS_36BIT powerpc mpc85xx p1022ds freescale - P1022DS:36BIT +P1022DS_36BIT_SDCARD powerpc mpc85xx p1022ds freescale - P1022DS:36BIT,SDCARD +P1022DS_36BIT_SPIFLASH powerpc mpc85xx p1022ds freescale - P1022DS:36BIT,SPIFLASH +P1022DS_SDCARD powerpc mpc85xx p1022ds freescale - P1022DS:SDCARD +P1022DS_SPIFLASH powerpc mpc85xx p1022ds freescale - P1022DS:SPIFLASH P1023RDS powerpc mpc85xx p1023rds freescale - P1023RDS P1023RDS_NAND powerpc mpc85xx p1023rds freescale - P1023RDS:NAND P1024RDB powerpc mpc85xx p1_p2_rdb_pc freescale - p1_p2_rdb_pc:P1024RDB
include/configs/P1022DS.h +58 -5
89 lines not on this page · raw message
Signature · 1 line
1.7.2.5