]> git.kernelconcepts.de Git - karo-tx-uboot.git/commitdiff
sh: Move some defs to convince 'pcrel too far'
authorNobuhiro Iwamatsu <iwamatsu@nigauri.org>
Fri, 30 Oct 2009 01:01:25 +0000 (10:01 +0900)
committerNobuhiro Iwamatsu <iwamatsu@nigauri.org>
Fri, 30 Oct 2009 01:02:00 +0000 (10:02 +0900)
Signed-off-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
Signed-off-by: Takashi Yoshii <yoshii.takashi@gmail.com>
board/renesas/sh7785lcr/lowlevel_init.S

index 7faad95ffd7e3c72a9c3877e3d4db0d6d33ad530..40d9b08c7ddd47c1618e991fc7e7207571d0ae86 100644 (file)
@@ -178,60 +178,6 @@ lbsc_end:
 
        .align 4
 
-/*------- LBSC -------*/
-MMSELR_A:      .long   0xfc400020
-#if defined(CONFIG_SH_32BIT)
-MMSELR_D:      .long   0xa5a50005
-#else
-MMSELR_D:      .long   0xa5a50002
-#endif
-
-/*------- DBSC2 -------*/
-#define DBSC2_BASE     0xfe800000
-DBSC2_DBSTATE_A:       .long   DBSC2_BASE + 0x0c
-DBSC2_DBEN_A:          .long   DBSC2_BASE + 0x10
-DBSC2_DBCMDCNT_A:      .long   DBSC2_BASE + 0x14
-DBSC2_DBCONF_A:                .long   DBSC2_BASE + 0x20
-DBSC2_DBTR0_A:         .long   DBSC2_BASE + 0x30
-DBSC2_DBTR1_A:         .long   DBSC2_BASE + 0x34
-DBSC2_DBTR2_A:         .long   DBSC2_BASE + 0x38
-DBSC2_DBRFCNT0_A:      .long   DBSC2_BASE + 0x40
-DBSC2_DBRFCNT1_A:      .long   DBSC2_BASE + 0x44
-DBSC2_DBRFCNT2_A:      .long   DBSC2_BASE + 0x48
-DBSC2_DBRFSTS_A:       .long   DBSC2_BASE + 0x4c
-DBSC2_DBFREQ_A:                .long   DBSC2_BASE + 0x50
-DBSC2_DBDICODTOCD_A:   .long   DBSC2_BASE + 0x54
-DBSC2_DBMRCNT_A:       .long   DBSC2_BASE + 0x60
-DDR_DUMMY_ACCESS_A:    .long   0x40000000
-
-DBSC2_DBCONF_D:                .long   0x00630002
-DBSC2_DBTR0_D:         .long   0x050b1f04
-DBSC2_DBTR1_D:         .long   0x00040204
-DBSC2_DBTR2_D:         .long   0x02100308
-DBSC2_DBFREQ_D1:       .long   0x00000000
-DBSC2_DBFREQ_D2:       .long   0x00000100
-DBSC2_DBDICODTOCD_D:   .long   0x000f0907
-
-DBSC2_DBCMDCNT_D_CKE_H:        .long   0x00000003
-DBSC2_DBCMDCNT_D_PALL: .long   0x00000002
-DBSC2_DBCMDCNT_D_REF:  .long   0x00000004
-
-DBSC2_DBMRCNT_D_EMRS2: .long   0x00020000
-DBSC2_DBMRCNT_D_EMRS3: .long   0x00030000
-DBSC2_DBMRCNT_D_EMRS1_1:       .long   0x00010006
-DBSC2_DBMRCNT_D_EMRS1_2:       .long   0x00010386
-DBSC2_DBMRCNT_D_MRS_1: .long   0x00000952
-DBSC2_DBMRCNT_D_MRS_2: .long   0x00000852
-
-DBSC2_DBEN_D:          .long   0x00000001
-
-DBSC2_DBPDCNT0_D3:     .long   0x00000080
-DBSC2_DBRFCNT1_D:      .long   0x00000926
-DBSC2_DBRFCNT2_D:      .long   0x00fe00fe
-DBSC2_DBRFCNT0_D:      .long   0x00010000
-
-WAIT_200US:    .long   33333
-
 /*------- GPIO -------*/
 PACR_D:                .long   0x0000
 PBCR_D:                .long   0x0000
@@ -291,6 +237,59 @@ PPUPR2_A:  .long   GPIO_BASE + 0x62
 P1MSELR_A:     .long   GPIO_BASE + 0x80
 P2MSELR_A:     .long   GPIO_BASE + 0x82
 
+MMSELR_A:      .long   0xfc400020
+#if defined(CONFIG_SH_32BIT)
+MMSELR_D:      .long   0xa5a50005
+#else
+MMSELR_D:      .long   0xa5a50002
+#endif
+
+/*------- DBSC2 -------*/
+#define DBSC2_BASE     0xfe800000
+DBSC2_DBSTATE_A:       .long   DBSC2_BASE + 0x0c
+DBSC2_DBEN_A:          .long   DBSC2_BASE + 0x10
+DBSC2_DBCMDCNT_A:      .long   DBSC2_BASE + 0x14
+DBSC2_DBCONF_A:                .long   DBSC2_BASE + 0x20
+DBSC2_DBTR0_A:         .long   DBSC2_BASE + 0x30
+DBSC2_DBTR1_A:         .long   DBSC2_BASE + 0x34
+DBSC2_DBTR2_A:         .long   DBSC2_BASE + 0x38
+DBSC2_DBRFCNT0_A:      .long   DBSC2_BASE + 0x40
+DBSC2_DBRFCNT1_A:      .long   DBSC2_BASE + 0x44
+DBSC2_DBRFCNT2_A:      .long   DBSC2_BASE + 0x48
+DBSC2_DBRFSTS_A:       .long   DBSC2_BASE + 0x4c
+DBSC2_DBFREQ_A:                .long   DBSC2_BASE + 0x50
+DBSC2_DBDICODTOCD_A:.long      DBSC2_BASE + 0x54
+DBSC2_DBMRCNT_A:       .long   DBSC2_BASE + 0x60
+DDR_DUMMY_ACCESS_A:    .long   0x40000000
+
+DBSC2_DBCONF_D:                .long   0x00630002
+DBSC2_DBTR0_D:         .long   0x050b1f04
+DBSC2_DBTR1_D:         .long   0x00040204
+DBSC2_DBTR2_D:         .long   0x02100308
+DBSC2_DBFREQ_D1:       .long   0x00000000
+DBSC2_DBFREQ_D2:       .long   0x00000100
+DBSC2_DBDICODTOCD_D:.long      0x000f0907
+
+DBSC2_DBCMDCNT_D_CKE_H:        .long   0x00000003
+DBSC2_DBCMDCNT_D_PALL: .long   0x00000002
+DBSC2_DBCMDCNT_D_REF:  .long   0x00000004
+
+DBSC2_DBMRCNT_D_EMRS2: .long   0x00020000
+DBSC2_DBMRCNT_D_EMRS3: .long   0x00030000
+DBSC2_DBMRCNT_D_EMRS1_1:       .long   0x00010006
+DBSC2_DBMRCNT_D_EMRS1_2:       .long   0x00010386
+DBSC2_DBMRCNT_D_MRS_1: .long   0x00000952
+DBSC2_DBMRCNT_D_MRS_2: .long   0x00000852
+
+DBSC2_DBEN_D:          .long   0x00000001
+
+DBSC2_DBPDCNT0_D3:     .long   0x00000080
+DBSC2_DBRFCNT1_D:      .long   0x00000926
+DBSC2_DBRFCNT2_D:      .long   0x00fe00fe
+DBSC2_DBRFCNT0_D:      .long   0x00010000
+
+WAIT_200US:    .long   33333
+
 /*------- LBSC -------*/
 PASCR_A:               .long   0xff000070
 PASCR_32BIT_MODE:      .long   0x80000000      /* check booting mode */