unified MX27, MX25, MX37 trees

[karo-tx-redboot.git] / packages / hal / arm / mxc91321 / var / v2_0 / src / soc_misc.c

diff --git a/packages/hal/arm/mxc91321/var/v2_0/src/soc_misc.c b/packages/hal/arm/mxc91321/var/v2_0/src/soc_misc.c
index 9abce3186976219496303c50aeea9b8d8b4fe581..78a68208fd72696bdfbb223eb094c14e6e4bba0d 100644 (file)
--- a/packages/hal/arm/mxc91321/var/v2_0/src/soc_misc.c
+++ b/packages/hal/arm/mxc91321/var/v2_0/src/soc_misc.c
@@ -70,17 +70,12 @@ externC void plf_hardware_init(void);
 #define IIM_SREV_REV_SH         4
 #define IIM_SREV_REV_LEN        4
 #define PROD_SIGNATURE_MX31     0x1
-#define PROD_SIGNATURE_MXC91331 0x4
 #define PROD_SIGNATURE_MXC91321 0x6
-#define PROD_SIGNATURE_MXC91231 0x8
-#define PROD_SIGNATURE_MXC91131 0x10
 
-#if defined(CYGPKG_HAL_ARM_MXC91331_CHIP)
-#define PROD_SIGNATURE_SUPPORTED  PROD_SIGNATURE_MXC91331
-#elif defined(CYGPKG_HAL_ARM_MXC91321_CHIP)
+#if defined(CYGPKG_HAL_ARM_MXC91321_CHIP)
 #define PROD_SIGNATURE_SUPPORTED  PROD_SIGNATURE_MXC91321
 #else
-#error Neither MXC91331 nor MXC91321 defined. What is it?
+#error MXC91321 not defined. What is it?
 #endif
 #define CHIP_VERSION_NONE           0xFFFFFFFF      // invalid product ID
 #define CHIP_VERSION_UNKNOWN        0xDEADBEEF      // invalid chip rev
@@ -126,36 +121,6 @@ void hal_hardware_init(void)
 
     find_correct_chip = ver;
 
-#if defined(CYGPKG_HAL_ARM_MXC91331_CHIP)
-    unsigned char chip_ver = readb(INTERNAL_ROM_VA + 0x60);
-
-    if (ver != CHIP_VERSION_NONE) {
-        /* Valid product revision found. Check actual silicon rev and
-         * NOT use the version from the ROM code. */
-        switch (ver & 0xFF) {
-        case 0x40:
-            HAL_PLATFORM_EXTRA[5] = '2';
-            HAL_PLATFORM_EXTRA[7] = '1';
-            system_rev |= 2 << MAJOR_NUMBER_OFFSET;
-            system_rev |= 1 << MINOR_NUMBER_OFFSET;
-            break;
-        default:
-            HAL_PLATFORM_EXTRA[5] = 'x';
-            HAL_PLATFORM_EXTRA[7] = 'x';
-            HAL_PLATFORM_EXTRA[9] = 'x';
-            system_rev |= 1 << MAJOR_NUMBER_OFFSET;
-            system_rev |= 0 << MINOR_NUMBER_OFFSET;
-            find_correct_chip = CHIP_VERSION_UNKNOWN;
-            break;
-        }
-    } else {
-        if (chip_ver == 2) {
-            HAL_PLATFORM_EXTRA[5] = '2';
-            system_rev |= 2 << MAJOR_NUMBER_OFFSET;
-            system_rev |= 0 << MINOR_NUMBER_OFFSET;
-        }
-    }
-#else
     if (ver != CHIP_VERSION_NONE) {
         switch (ver & 0xFF) {
         case 0x0:
@@ -207,7 +172,6 @@ void hal_hardware_init(void)
             break;
         }
     }
-#endif  // CYGPKG_HAL_ARM_MXC91331_CHIP
 
     if ((esdmisc & 0x4) == 0) {
         HAL_PLATFORM_EXTRA[16] = 'S';