powerpc: mpc85xx: Do not build errata command in SPL

[u-boot] / board / gdsys / 405ep / dlvision-10g.c

diff --git a/board/gdsys/405ep/dlvision-10g.c b/board/gdsys/405ep/dlvision-10g.c
index 48d878643bf275c9b95c7d9de1d9700b42953369..54c7eb3a12aba1abbf3f33e7dc0b6fb420ad3451 100644 (file)
--- a/board/gdsys/405ep/dlvision-10g.c
+++ b/board/gdsys/405ep/dlvision-10g.c
@@ -25,17 +25,19 @@
 #define LATCH2_MC2_PRESENT_N 0x0080
 
 enum {
-       UNITTYPE_VIDEO_USER = 0,
-       UNITTYPE_MAIN_USER = 1,
-       UNITTYPE_VIDEO_SERVER = 2,
-       UNITTYPE_MAIN_SERVER = 3,
+       UNITTYPE_MAIN = 1<<0,
+       UNITTYPE_SERVER = 1<<1,
+       UNITTYPE_DISPLAYPORT = 1<<2,
 };
 
 enum {
        HWVER_101 = 0,
        HWVER_110 = 1,
-       HWVER_120 = 2,
-       HWVER_130 = 3,
+       HWVER_130 = 2,
+       HWVER_140 = 3,
+       HWVER_150 = 4,
+       HWVER_160 = 5,
+       HWVER_170 = 6,
 };
 
 enum {
@@ -55,6 +57,8 @@ enum {
        RAM_DDR2_64 = 2,
 };
 
+struct ihs_fpga *fpga_ptr[] = CONFIG_SYS_FPGA_PTR;
+
 int misc_init_r(void)
 {
        /* startup fans */
@@ -79,10 +83,9 @@ static unsigned int get_mc2_present(void)
 
 static void print_fpga_info(unsigned dev)
 {
-       struct ihs_fpga *fpga = (struct ihs_fpga *) CONFIG_SYS_FPGA_BASE(dev);
-       u16 versions = in_le16(&fpga->versions);
-       u16 fpga_version = in_le16(&fpga->fpga_version);
-       u16 fpga_features = in_le16(&fpga->fpga_features);
+       u16 versions;
+       u16 fpga_version;
+       u16 fpga_features;
        unsigned unit_type;
        unsigned hardware_version;
        unsigned feature_rs232;
@@ -96,6 +99,10 @@ static void print_fpga_info(unsigned dev)
 
        printf("FPGA%d: ", dev);
 
+       FPGA_GET_REG(dev, versions, &versions);
+       FPGA_GET_REG(dev, fpga_version, &fpga_version);
+       FPGA_GET_REG(dev, fpga_features, &fpga_features);
+
        hardware_version = versions & 0x000f;
 
        if (fpga_state
@@ -116,43 +123,48 @@ static void print_fpga_info(unsigned dev)
        feature_carriers = (fpga_features >> 2) & 0x0003;
        feature_video_channels = fpga_features & 0x0003;
 
-       switch (unit_type) {
-       case UNITTYPE_VIDEO_USER:
-               printf("Videochannel Userside");
-               break;
+       if (unit_type & UNITTYPE_MAIN)
+               printf("Mainchannel ");
+       else
+               printf("Videochannel ");
 
-       case UNITTYPE_MAIN_USER:
-               printf("Mainchannel Userside");
-               break;
+       if (unit_type & UNITTYPE_SERVER)
+               printf("Serverside ");
+       else
+               printf("Userside ");
+
+       if (unit_type & UNITTYPE_DISPLAYPORT)
+               printf("DisplayPort");
+       else
+               printf("DVI-DL");
 
-       case UNITTYPE_VIDEO_SERVER:
-               printf("Videochannel Serverside");
+       switch (hardware_version) {
+       case HWVER_101:
+               printf(" HW-Ver 1.01\n");
                break;
 
-       case UNITTYPE_MAIN_SERVER:
-               printf("Mainchannel Serverside");
+       case HWVER_110:
+               printf(" HW-Ver 1.10-1.20\n");
                break;
 
-       default:
-               printf("UnitType %d(not supported)", unit_type);
+       case HWVER_130:
+               printf(" HW-Ver 1.30\n");
                break;
-       }
 
-       switch (hardware_version) {
-       case HWVER_101:
-               printf(" HW-Ver 1.01\n");
+       case HWVER_140:
+               printf(" HW-Ver 1.40-1.43\n");
                break;
 
-       case HWVER_110:
-               printf(" HW-Ver 1.10-1.12\n");
+       case HWVER_150:
+               printf(" HW-Ver 1.50\n");
                break;
 
-       case HWVER_120:
-               printf(" HW-Ver 1.20\n");
+       case HWVER_160:
+               printf(" HW-Ver 1.60-1.61\n");
                break;
 
-       case HWVER_130:
-               printf(" HW-Ver 1.30\n");
+       case HWVER_170:
+               printf(" HW-Ver 1.70\n");
                break;
 
        default:
@@ -247,14 +259,15 @@ int checkboard(void)
 
 int last_stage_init(void)
 {
-       struct ihs_fpga *fpga = (struct ihs_fpga *) CONFIG_SYS_FPGA_BASE(0);
-       u16 versions = in_le16(&fpga->versions);
+       u16 versions;
+
+       FPGA_GET_REG(0, versions, &versions);
 
        print_fpga_info(0);
        if (get_mc2_present())
                print_fpga_info(1);
 
-       if (((versions >> 4) & 0x000f) != UNITTYPE_MAIN_USER)
+       if (((versions >> 4) & 0x000f) & UNITTYPE_SERVER)
                return 0;
 
        if (!get_fpga_state(0) || (get_hwver() == HWVER_101))