Skip to content

Commit 7426869

Browse files
committed
Merge tag 'microblaze-v5.12' of git://git.monstr.eu/linux-2.6-microblaze
Pull microblaze updates from Michal Simek: - Fix DTB alignment - Remove code for very old GCC versions - Remove TRACING_SUPPORT selection * tag 'microblaze-v5.12' of git://git.monstr.eu/linux-2.6-microblaze: microblaze: Fix built-in DTB alignment to be 8-byte aligned microblaze: Remove support for gcc < 4 microblaze: do not select TRACING_SUPPORT directly
2 parents a56ff24 + 48783be commit 7426869

3 files changed

Lines changed: 1 addition & 28 deletions

File tree

arch/microblaze/Kconfig

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,6 @@ config MICROBLAZE
3838
select OF_EARLY_FLATTREE
3939
select PCI_DOMAINS_GENERIC if PCI
4040
select PCI_SYSCALL if PCI
41-
select TRACING_SUPPORT
4241
select VIRT_TO_BUS
4342
select CPU_NO_EFFICIENT_FFS
4443
select MMU_GATHER_NO_RANGE

arch/microblaze/kernel/module.c

Lines changed: 0 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,6 @@ int apply_relocate_add(Elf32_Shdr *sechdrs, const char *strtab,
2424
Elf32_Sym *sym;
2525
unsigned long int *location;
2626
unsigned long int value;
27-
#if __GNUC__ < 4
28-
unsigned long int old_value;
29-
#endif
3027

3128
pr_debug("Applying add relocation section %u to %u\n",
3229
relsec, sechdrs[relsec].sh_info);
@@ -49,40 +46,17 @@ int apply_relocate_add(Elf32_Shdr *sechdrs, const char *strtab,
4946
*/
5047

5148
case R_MICROBLAZE_32:
52-
#if __GNUC__ < 4
53-
old_value = *location;
54-
*location = value + old_value;
55-
56-
pr_debug("R_MICROBLAZE_32 (%08lx->%08lx)\n",
57-
old_value, value);
58-
#else
5949
*location = value;
60-
#endif
6150
break;
6251

6352
case R_MICROBLAZE_64:
64-
#if __GNUC__ < 4
65-
/* Split relocs only required/used pre gcc4.1.1 */
66-
old_value = ((location[0] & 0x0000FFFF) << 16) |
67-
(location[1] & 0x0000FFFF);
68-
value += old_value;
69-
#endif
7053
location[0] = (location[0] & 0xFFFF0000) |
7154
(value >> 16);
7255
location[1] = (location[1] & 0xFFFF0000) |
7356
(value & 0xFFFF);
74-
#if __GNUC__ < 4
75-
pr_debug("R_MICROBLAZE_64 (%08lx->%08lx)\n",
76-
old_value, value);
77-
#endif
7857
break;
7958

8059
case R_MICROBLAZE_64_PCREL:
81-
#if __GNUC__ < 4
82-
old_value = (location[0] & 0xFFFF) << 16 |
83-
(location[1] & 0xFFFF);
84-
value -= old_value;
85-
#endif
8660
value -= (unsigned long int)(location) + 4;
8761
location[0] = (location[0] & 0xFFFF0000) |
8862
(value >> 16);

arch/microblaze/kernel/vmlinux.lds.S

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ SECTIONS {
4545
_etext = . ;
4646
}
4747

48-
. = ALIGN (4) ;
48+
. = ALIGN (8) ;
4949
__fdt_blob : AT(ADDR(__fdt_blob) - LOAD_OFFSET) {
5050
_fdt_start = . ; /* place for fdt blob */
5151
*(__fdt_blob) ; /* Any link-placed DTB */

0 commit comments

Comments
 (0)